You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/06/20 20:25:22 UTC
[01/18] airavata git commit: excluding mysql from distribution
Repository: airavata
Updated Branches:
refs/heads/develop a79e69028 -> c3ca68144
excluding mysql from distribution
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cf6304c6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cf6304c6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cf6304c6
Branch: refs/heads/develop
Commit: cf6304c6e59671793a8d36c24aa249a3d19fe3e5
Parents: 8496ae6
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Mar 22 16:10:39 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Mar 22 16:10:39 2016 -0400
----------------------------------------------------------------------
distribution/src/main/assembly/bin-assembly.xml | 223 ++++++++++---------
1 file changed, 113 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf6304c6/distribution/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml
index 8650793..b9146d5 100644
--- a/distribution/src/main/assembly/bin-assembly.xml
+++ b/distribution/src/main/assembly/bin-assembly.xml
@@ -26,89 +26,89 @@
<!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
]>
<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
- <fileSets>
+ <fileSets>
- <!-- ********************** copy release notes files ********************** -->
- <fileSet>
- <directory>../../../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <!-- ********************** copy licenses, readme etc. ********************** -->
- <fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>INSTALL</include>
- </includes>
- </fileSet>
+ <!-- ********************** copy release notes files ********************** -->
+ <fileSet>
+ <directory>../../../</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <!-- ********************** copy licenses, readme etc. ********************** -->
+ <fileSet>
+ <directory>src/main/resources/</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>INSTALL</include>
+ </includes>
+ </fileSet>
- <!-- ********************** copy database scripts ********************** -->
- <fileSet>
- <directory>../modules/registry/registry-core/src/main/resources/
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- <include>logo.txt</include>
- <include>startNetworkServer</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>**/*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/conf</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>zoo.cfg</include>
- <include>registry.properties</include>
- <include>log4j.properties</include>
- <include>host.xml</include>
- <include>persistence.xml</include>
- <include>provenance.sql</include>
- <include>gfac-config.yaml</include>
- <include>PBSTemplate.xslt</include>
- <include>SLURMTemplate.xslt</include>
- <include>LSFTemplate.xslt</include>
- <include>UGETemplate.xslt</include>
- <include>ForkTemplate.xslt</include>
- <include>gsissh.properties</include>
- <include>airavata.jks</include>
- <include>client_truststore.jks</include>
- <include>airavata-default-xacml-policy.xml</include>
- </includes>
- </fileSet>
+ <!-- ********************** copy database scripts ********************** -->
+ <fileSet>
+ <directory>../modules/registry/registry-core/src/main/resources/
+ </directory>
+ <outputDirectory>bin/database_scripts
+ </outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>777</fileMode>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ <include>logo.txt</include>
+ <include>startNetworkServer</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <fileMode>777</fileMode>
+ <includes>
+ <include>*.sh</include>
+ <include>**/*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/conf</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>airavata-server.properties</include>
+ <include>zoo.cfg</include>
+ <include>registry.properties</include>
+ <include>log4j.properties</include>
+ <include>host.xml</include>
+ <include>persistence.xml</include>
+ <include>provenance.sql</include>
+ <include>gfac-config.yaml</include>
+ <include>PBSTemplate.xslt</include>
+ <include>SLURMTemplate.xslt</include>
+ <include>LSFTemplate.xslt</include>
+ <include>UGETemplate.xslt</include>
+ <include>ForkTemplate.xslt</include>
+ <include>gsissh.properties</include>
+ <include>airavata.jks</include>
+ <include>client_truststore.jks</include>
+ <include>airavata-default-xacml-policy.xml</include>
+ </includes>
+ </fileSet>
<!-- Create logs directory -->
<fileSet>
@@ -119,39 +119,42 @@
</excludes>
</fileSet>
- <!-- ********************** Copy samples ********************** -->
- <fileSet>
- <directory>${project.build.directory}/samples/applications
- </directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
- </fileSet>
+ <!-- ********************** Copy samples ********************** -->
+ <fileSet>
+ <directory>${project.build.directory}/samples/applications
+ </directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
- </fileSets>
+ </fileSets>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
</includes>
- </dependencySet>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
+ <excludes>
+ <exclude>mysql:mysql-connector-java</exclude>
+ </excludes>
+ </dependencySet>
- </dependencySets>
+ </dependencySets>
</assembly>
[08/18] airavata git commit: closes apache/airavata#31 - merged with
develop branch
Posted by sc...@apache.org.
closes apache/airavata#31 - merged with develop branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b5bdad1a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b5bdad1a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b5bdad1a
Branch: refs/heads/develop
Commit: b5bdad1a6c92c909701dad87d42cd18c529b3e86
Parents: e0b674c
Author: Suresh Marru <sm...@apache.org>
Authored: Fri Apr 15 15:38:41 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Apr 15 15:38:41 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e0b674c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e0b674c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e0b674c5
Branch: refs/heads/develop
Commit: e0b674c5f102ab820ef99d016e92d8f37f06c435
Parents: f0198a4 6c301e6
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Mar 30 17:01:17 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Mar 30 17:01:17 2016 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 10 -------
modules/cloud/pom.xml | 19 +++++++++++++
.../org/apache/airavata/cloud/CloudMain.java | 28 ++++++++++++++++++++
pom.xml | 1 +
4 files changed, 48 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[15/18] airavata git commit: adding user profile thrift generated
files
Posted by sc...@apache.org.
adding user profile thrift generated files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/75a87bb6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/75a87bb6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/75a87bb6
Branch: refs/heads/develop
Commit: 75a87bb6162b95dcdadcf9e5842cd7ff1b8087f7
Parents: f23fbd5
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 20 00:38:40 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 20 00:38:40 2016 -0400
----------------------------------------------------------------------
.../airavata/user_profile_model_constants.cpp | 36 +
.../lib/airavata/user_profile_model_constants.h | 42 +
.../lib/airavata/user_profile_model_types.cpp | 981 +++++++
.../lib/airavata/user_profile_model_types.h | 373 +++
.../resources/lib/Airavata/Model/User/Types.php | 1079 +++++++
.../lib/apache/airavata/model/user/__init__.py | 1 +
.../lib/apache/airavata/model/user/constants.py | 12 +
.../lib/apache/airavata/model/user/ttypes.py | 738 +++++
.../airavata/model/user/NSFDemographics.java | 1007 +++++++
.../org/apache/airavata/model/user/Status.java | 98 +
.../airavata/model/user/USCitizenship.java | 69 +
.../apache/airavata/model/user/UserProfile.java | 2766 ++++++++++++++++++
.../apache/airavata/model/user/disability.java | 68 +
.../apache/airavata/model/user/ethnicity.java | 67 +
.../org/apache/airavata/model/user/race.java | 86 +
.../model/user/user_profile_modelConstants.java | 58 +
16 files changed, 7481 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.cpp
new file mode 100644
index 0000000..617e15c
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.cpp
@@ -0,0 +1,36 @@
+/**
+ * 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
+ */
+#include "user_profile_model_constants.h"
+
+namespace apache { namespace airavata { namespace model { namespace user {
+
+const user_profile_modelConstants g_user_profile_model_constants;
+
+user_profile_modelConstants::user_profile_modelConstants() {
+ USER_PROFILE_VERSION = "1.0";
+
+}
+
+}}}} // namespace
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.h
new file mode 100644
index 0000000..813151f
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_constants.h
@@ -0,0 +1,42 @@
+/**
+ * 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
+ */
+#ifndef user_profile_model_CONSTANTS_H
+#define user_profile_model_CONSTANTS_H
+
+#include "user_profile_model_types.h"
+
+namespace apache { namespace airavata { namespace model { namespace user {
+
+class user_profile_modelConstants {
+ public:
+ user_profile_modelConstants();
+
+ std::string USER_PROFILE_VERSION;
+};
+
+extern const user_profile_modelConstants g_user_profile_model_constants;
+
+}}}} // namespace
+
+#endif
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
new file mode 100644
index 0000000..466013d
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
@@ -0,0 +1,981 @@
+/**
+ * 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
+ */
+#include "user_profile_model_types.h"
+
+#include <algorithm>
+#include <ostream>
+
+#include <thrift/TToString.h>
+
+namespace apache { namespace airavata { namespace model { namespace user {
+
+int _kStatusValues[] = {
+ Status::ACTIVE,
+ Status::CONFIRMED,
+ Status::APPROVED,
+ Status::DELETED,
+ Status::DUPLICATE,
+ Status::GRACE_PERIOD,
+ Status::INVITED,
+ Status::DENIED,
+ Status::PENDING,
+ Status::PENDING_APPROVAL,
+ Status::PENDING_CONFIRMATION,
+ Status::SUSPENDED,
+ Status::DECLINED,
+ Status::EXPIRED
+};
+const char* _kStatusNames[] = {
+ "ACTIVE",
+ "CONFIRMED",
+ "APPROVED",
+ "DELETED",
+ "DUPLICATE",
+ "GRACE_PERIOD",
+ "INVITED",
+ "DENIED",
+ "PENDING",
+ "PENDING_APPROVAL",
+ "PENDING_CONFIRMATION",
+ "SUSPENDED",
+ "DECLINED",
+ "EXPIRED"
+};
+const std::map<int, const char*> _Status_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(14, _kStatusValues, _kStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kUSCitizenshipValues[] = {
+ USCitizenship::US_CITIZEN,
+ USCitizenship::US_PERMANENT_RESIDENT,
+ USCitizenship::OTHER_NON_US_CITIZEN
+};
+const char* _kUSCitizenshipNames[] = {
+ "US_CITIZEN",
+ "US_PERMANENT_RESIDENT",
+ "OTHER_NON_US_CITIZEN"
+};
+const std::map<int, const char*> _USCitizenship_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kUSCitizenshipValues, _kUSCitizenshipNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kethnicityValues[] = {
+ ethnicity::HISPANIC_LATINO,
+ ethnicity::NOT_HISPANIC_LATINO
+};
+const char* _kethnicityNames[] = {
+ "HISPANIC_LATINO",
+ "NOT_HISPANIC_LATINO"
+};
+const std::map<int, const char*> _ethnicity_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kethnicityValues, _kethnicityNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kraceValues[] = {
+ race::ASIAN,
+ race::AMERICAN_INDIAN_OR_ALASKAN_NATIVE,
+ race::BLACK_OR_AFRICAN_AMERICAN,
+ race::NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER,
+ race::WHITE
+};
+const char* _kraceNames[] = {
+ "ASIAN",
+ "AMERICAN_INDIAN_OR_ALASKAN_NATIVE",
+ "BLACK_OR_AFRICAN_AMERICAN",
+ "NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER",
+ "WHITE"
+};
+const std::map<int, const char*> _race_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kraceValues, _kraceNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kdisabilityValues[] = {
+ disability::HEARING_IMAPAIRED,
+ disability::VISUAL_IMPAIRED,
+ disability::MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT,
+ disability::OTHER_IMPAIRMENT
+};
+const char* _kdisabilityNames[] = {
+ "HEARING_IMAPAIRED",
+ "VISUAL_IMPAIRED",
+ "MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT",
+ "OTHER_IMPAIRMENT"
+};
+const std::map<int, const char*> _disability_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kdisabilityValues, _kdisabilityNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+
+NSFDemographics::~NSFDemographics() throw() {
+}
+
+
+void NSFDemographics::__set_gender(const std::string& val) {
+ this->gender = val;
+__isset.gender = true;
+}
+
+void NSFDemographics::__set_usCitizenship(const USCitizenship::type val) {
+ this->usCitizenship = val;
+__isset.usCitizenship = true;
+}
+
+void NSFDemographics::__set_ethnicities(const std::vector<ethnicity::type> & val) {
+ this->ethnicities = val;
+__isset.ethnicities = true;
+}
+
+void NSFDemographics::__set_races(const std::vector<race::type> & val) {
+ this->races = val;
+__isset.races = true;
+}
+
+void NSFDemographics::__set_disabilities(const std::vector<disability::type> & val) {
+ this->disabilities = val;
+__isset.disabilities = true;
+}
+
+uint32_t NSFDemographics::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gender);
+ this->__isset.gender = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast0;
+ xfer += iprot->readI32(ecast0);
+ this->usCitizenship = (USCitizenship::type)ecast0;
+ this->__isset.usCitizenship = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->ethnicities.clear();
+ uint32_t _size1;
+ ::apache::thrift::protocol::TType _etype4;
+ xfer += iprot->readListBegin(_etype4, _size1);
+ this->ethnicities.resize(_size1);
+ uint32_t _i5;
+ for (_i5 = 0; _i5 < _size1; ++_i5)
+ {
+ int32_t ecast6;
+ xfer += iprot->readI32(ecast6);
+ this->ethnicities[_i5] = (ethnicity::type)ecast6;
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.ethnicities = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->races.clear();
+ uint32_t _size7;
+ ::apache::thrift::protocol::TType _etype10;
+ xfer += iprot->readListBegin(_etype10, _size7);
+ this->races.resize(_size7);
+ uint32_t _i11;
+ for (_i11 = 0; _i11 < _size7; ++_i11)
+ {
+ int32_t ecast12;
+ xfer += iprot->readI32(ecast12);
+ this->races[_i11] = (race::type)ecast12;
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.races = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->disabilities.clear();
+ uint32_t _size13;
+ ::apache::thrift::protocol::TType _etype16;
+ xfer += iprot->readListBegin(_etype16, _size13);
+ this->disabilities.resize(_size13);
+ uint32_t _i17;
+ for (_i17 = 0; _i17 < _size13; ++_i17)
+ {
+ int32_t ecast18;
+ xfer += iprot->readI32(ecast18);
+ this->disabilities[_i17] = (disability::type)ecast18;
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.disabilities = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t NSFDemographics::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("NSFDemographics");
+
+ if (this->__isset.gender) {
+ xfer += oprot->writeFieldBegin("gender", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->gender);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.usCitizenship) {
+ xfer += oprot->writeFieldBegin("usCitizenship", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32((int32_t)this->usCitizenship);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.ethnicities) {
+ xfer += oprot->writeFieldBegin("ethnicities", ::apache::thrift::protocol::T_LIST, 3);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->ethnicities.size()));
+ std::vector<ethnicity::type> ::const_iterator _iter19;
+ for (_iter19 = this->ethnicities.begin(); _iter19 != this->ethnicities.end(); ++_iter19)
+ {
+ xfer += oprot->writeI32((int32_t)(*_iter19));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.races) {
+ xfer += oprot->writeFieldBegin("races", ::apache::thrift::protocol::T_LIST, 4);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->races.size()));
+ std::vector<race::type> ::const_iterator _iter20;
+ for (_iter20 = this->races.begin(); _iter20 != this->races.end(); ++_iter20)
+ {
+ xfer += oprot->writeI32((int32_t)(*_iter20));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.disabilities) {
+ xfer += oprot->writeFieldBegin("disabilities", ::apache::thrift::protocol::T_LIST, 5);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->disabilities.size()));
+ std::vector<disability::type> ::const_iterator _iter21;
+ for (_iter21 = this->disabilities.begin(); _iter21 != this->disabilities.end(); ++_iter21)
+ {
+ xfer += oprot->writeI32((int32_t)(*_iter21));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(NSFDemographics &a, NSFDemographics &b) {
+ using ::std::swap;
+ swap(a.gender, b.gender);
+ swap(a.usCitizenship, b.usCitizenship);
+ swap(a.ethnicities, b.ethnicities);
+ swap(a.races, b.races);
+ swap(a.disabilities, b.disabilities);
+ swap(a.__isset, b.__isset);
+}
+
+NSFDemographics::NSFDemographics(const NSFDemographics& other22) {
+ gender = other22.gender;
+ usCitizenship = other22.usCitizenship;
+ ethnicities = other22.ethnicities;
+ races = other22.races;
+ disabilities = other22.disabilities;
+ __isset = other22.__isset;
+}
+NSFDemographics& NSFDemographics::operator=(const NSFDemographics& other23) {
+ gender = other23.gender;
+ usCitizenship = other23.usCitizenship;
+ ethnicities = other23.ethnicities;
+ races = other23.races;
+ disabilities = other23.disabilities;
+ __isset = other23.__isset;
+ return *this;
+}
+void NSFDemographics::printTo(std::ostream& out) const {
+ using ::apache::thrift::to_string;
+ out << "NSFDemographics(";
+ out << "gender="; (__isset.gender ? (out << to_string(gender)) : (out << "<null>"));
+ out << ", " << "usCitizenship="; (__isset.usCitizenship ? (out << to_string(usCitizenship)) : (out << "<null>"));
+ out << ", " << "ethnicities="; (__isset.ethnicities ? (out << to_string(ethnicities)) : (out << "<null>"));
+ out << ", " << "races="; (__isset.races ? (out << to_string(races)) : (out << "<null>"));
+ out << ", " << "disabilities="; (__isset.disabilities ? (out << to_string(disabilities)) : (out << "<null>"));
+ out << ")";
+}
+
+
+UserProfile::~UserProfile() throw() {
+}
+
+
+void UserProfile::__set_userModelVersion(const std::string& val) {
+ this->userModelVersion = val;
+}
+
+void UserProfile::__set_airavataInternalUserId(const std::string& val) {
+ this->airavataInternalUserId = val;
+}
+
+void UserProfile::__set_userId(const std::string& val) {
+ this->userId = val;
+}
+
+void UserProfile::__set_emails(const std::vector<std::string> & val) {
+ this->emails = val;
+}
+
+void UserProfile::__set_userName(const std::string& val) {
+ this->userName = val;
+__isset.userName = true;
+}
+
+void UserProfile::__set_gatewayId(const std::string& val) {
+ this->gatewayId = val;
+__isset.gatewayId = true;
+}
+
+void UserProfile::__set_orcidId(const std::string& val) {
+ this->orcidId = val;
+__isset.orcidId = true;
+}
+
+void UserProfile::__set_phones(const std::vector<std::string> & val) {
+ this->phones = val;
+__isset.phones = true;
+}
+
+void UserProfile::__set_country(const std::string& val) {
+ this->country = val;
+__isset.country = true;
+}
+
+void UserProfile::__set_nationality(const std::vector<std::string> & val) {
+ this->nationality = val;
+__isset.nationality = true;
+}
+
+void UserProfile::__set_homeOrganization(const std::string& val) {
+ this->homeOrganization = val;
+__isset.homeOrganization = true;
+}
+
+void UserProfile::__set_orginationAffiliation(const std::string& val) {
+ this->orginationAffiliation = val;
+__isset.orginationAffiliation = true;
+}
+
+void UserProfile::__set_creationTime(const std::string& val) {
+ this->creationTime = val;
+}
+
+void UserProfile::__set_lastAccessTime(const std::string& val) {
+ this->lastAccessTime = val;
+}
+
+void UserProfile::__set_validUntil(const std::string& val) {
+ this->validUntil = val;
+}
+
+void UserProfile::__set_State(const Status::type val) {
+ this->State = val;
+}
+
+void UserProfile::__set_comments(const std::string& val) {
+ this->comments = val;
+__isset.comments = true;
+}
+
+void UserProfile::__set_labeledURI(const std::vector<std::string> & val) {
+ this->labeledURI = val;
+__isset.labeledURI = true;
+}
+
+void UserProfile::__set_gpgKey(const std::string& val) {
+ this->gpgKey = val;
+__isset.gpgKey = true;
+}
+
+void UserProfile::__set_timeZone(const std::string& val) {
+ this->timeZone = val;
+__isset.timeZone = true;
+}
+
+void UserProfile::__set_nsfDemographics(const NSFDemographics& val) {
+ this->nsfDemographics = val;
+__isset.nsfDemographics = true;
+}
+
+uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_userModelVersion = false;
+ bool isset_airavataInternalUserId = false;
+ bool isset_userId = false;
+ bool isset_emails = false;
+ bool isset_creationTime = false;
+ bool isset_lastAccessTime = false;
+ bool isset_validUntil = false;
+ bool isset_State = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->userModelVersion);
+ isset_userModelVersion = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->airavataInternalUserId);
+ isset_airavataInternalUserId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->userId);
+ isset_userId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->emails.clear();
+ uint32_t _size24;
+ ::apache::thrift::protocol::TType _etype27;
+ xfer += iprot->readListBegin(_etype27, _size24);
+ this->emails.resize(_size24);
+ uint32_t _i28;
+ for (_i28 = 0; _i28 < _size24; ++_i28)
+ {
+ xfer += iprot->readString(this->emails[_i28]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ isset_emails = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->userName);
+ this->__isset.userName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ this->__isset.gatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 7:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->orcidId);
+ this->__isset.orcidId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 8:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->phones.clear();
+ uint32_t _size29;
+ ::apache::thrift::protocol::TType _etype32;
+ xfer += iprot->readListBegin(_etype32, _size29);
+ this->phones.resize(_size29);
+ uint32_t _i33;
+ for (_i33 = 0; _i33 < _size29; ++_i33)
+ {
+ xfer += iprot->readString(this->phones[_i33]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.phones = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 9:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->country);
+ this->__isset.country = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 10:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->nationality.clear();
+ uint32_t _size34;
+ ::apache::thrift::protocol::TType _etype37;
+ xfer += iprot->readListBegin(_etype37, _size34);
+ this->nationality.resize(_size34);
+ uint32_t _i38;
+ for (_i38 = 0; _i38 < _size34; ++_i38)
+ {
+ xfer += iprot->readString(this->nationality[_i38]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.nationality = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 11:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->homeOrganization);
+ this->__isset.homeOrganization = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 12:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->orginationAffiliation);
+ this->__isset.orginationAffiliation = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 13:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->creationTime);
+ isset_creationTime = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 14:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->lastAccessTime);
+ isset_lastAccessTime = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 15:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->validUntil);
+ isset_validUntil = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 16:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast39;
+ xfer += iprot->readI32(ecast39);
+ this->State = (Status::type)ecast39;
+ isset_State = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 17:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->comments);
+ this->__isset.comments = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 18:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->labeledURI.clear();
+ uint32_t _size40;
+ ::apache::thrift::protocol::TType _etype43;
+ xfer += iprot->readListBegin(_etype43, _size40);
+ this->labeledURI.resize(_size40);
+ uint32_t _i44;
+ for (_i44 = 0; _i44 < _size40; ++_i44)
+ {
+ xfer += iprot->readString(this->labeledURI[_i44]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.labeledURI = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 19:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gpgKey);
+ this->__isset.gpgKey = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 20:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->timeZone);
+ this->__isset.timeZone = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 21:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->nsfDemographics.read(iprot);
+ this->__isset.nsfDemographics = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_userModelVersion)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_airavataInternalUserId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_userId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_emails)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_creationTime)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_lastAccessTime)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_validUntil)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_State)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("UserProfile");
+
+ xfer += oprot->writeFieldBegin("userModelVersion", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->userModelVersion);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("airavataInternalUserId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->airavataInternalUserId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->userId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("emails", ::apache::thrift::protocol::T_LIST, 4);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->emails.size()));
+ std::vector<std::string> ::const_iterator _iter45;
+ for (_iter45 = this->emails.begin(); _iter45 != this->emails.end(); ++_iter45)
+ {
+ xfer += oprot->writeString((*_iter45));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+
+ if (this->__isset.userName) {
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeString(this->userName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayId) {
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->gatewayId);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.orcidId) {
+ xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeString(this->orcidId);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.phones) {
+ xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 8);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->phones.size()));
+ std::vector<std::string> ::const_iterator _iter46;
+ for (_iter46 = this->phones.begin(); _iter46 != this->phones.end(); ++_iter46)
+ {
+ xfer += oprot->writeString((*_iter46));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.country) {
+ xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeString(this->country);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.nationality) {
+ xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 10);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->nationality.size()));
+ std::vector<std::string> ::const_iterator _iter47;
+ for (_iter47 = this->nationality.begin(); _iter47 != this->nationality.end(); ++_iter47)
+ {
+ xfer += oprot->writeString((*_iter47));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.homeOrganization) {
+ xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeString(this->homeOrganization);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.orginationAffiliation) {
+ xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeString(this->orginationAffiliation);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeString(this->creationTime);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeString(this->lastAccessTime);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 15);
+ xfer += oprot->writeString(this->validUntil);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 16);
+ xfer += oprot->writeI32((int32_t)this->State);
+ xfer += oprot->writeFieldEnd();
+
+ if (this->__isset.comments) {
+ xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeString(this->comments);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.labeledURI) {
+ xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 18);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->labeledURI.size()));
+ std::vector<std::string> ::const_iterator _iter48;
+ for (_iter48 = this->labeledURI.begin(); _iter48 != this->labeledURI.end(); ++_iter48)
+ {
+ xfer += oprot->writeString((*_iter48));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gpgKey) {
+ xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 19);
+ xfer += oprot->writeString(this->gpgKey);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.timeZone) {
+ xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 20);
+ xfer += oprot->writeString(this->timeZone);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.nsfDemographics) {
+ xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 21);
+ xfer += this->nsfDemographics.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(UserProfile &a, UserProfile &b) {
+ using ::std::swap;
+ swap(a.userModelVersion, b.userModelVersion);
+ swap(a.airavataInternalUserId, b.airavataInternalUserId);
+ swap(a.userId, b.userId);
+ swap(a.emails, b.emails);
+ swap(a.userName, b.userName);
+ swap(a.gatewayId, b.gatewayId);
+ swap(a.orcidId, b.orcidId);
+ swap(a.phones, b.phones);
+ swap(a.country, b.country);
+ swap(a.nationality, b.nationality);
+ swap(a.homeOrganization, b.homeOrganization);
+ swap(a.orginationAffiliation, b.orginationAffiliation);
+ swap(a.creationTime, b.creationTime);
+ swap(a.lastAccessTime, b.lastAccessTime);
+ swap(a.validUntil, b.validUntil);
+ swap(a.State, b.State);
+ swap(a.comments, b.comments);
+ swap(a.labeledURI, b.labeledURI);
+ swap(a.gpgKey, b.gpgKey);
+ swap(a.timeZone, b.timeZone);
+ swap(a.nsfDemographics, b.nsfDemographics);
+ swap(a.__isset, b.__isset);
+}
+
+UserProfile::UserProfile(const UserProfile& other49) {
+ userModelVersion = other49.userModelVersion;
+ airavataInternalUserId = other49.airavataInternalUserId;
+ userId = other49.userId;
+ emails = other49.emails;
+ userName = other49.userName;
+ gatewayId = other49.gatewayId;
+ orcidId = other49.orcidId;
+ phones = other49.phones;
+ country = other49.country;
+ nationality = other49.nationality;
+ homeOrganization = other49.homeOrganization;
+ orginationAffiliation = other49.orginationAffiliation;
+ creationTime = other49.creationTime;
+ lastAccessTime = other49.lastAccessTime;
+ validUntil = other49.validUntil;
+ State = other49.State;
+ comments = other49.comments;
+ labeledURI = other49.labeledURI;
+ gpgKey = other49.gpgKey;
+ timeZone = other49.timeZone;
+ nsfDemographics = other49.nsfDemographics;
+ __isset = other49.__isset;
+}
+UserProfile& UserProfile::operator=(const UserProfile& other50) {
+ userModelVersion = other50.userModelVersion;
+ airavataInternalUserId = other50.airavataInternalUserId;
+ userId = other50.userId;
+ emails = other50.emails;
+ userName = other50.userName;
+ gatewayId = other50.gatewayId;
+ orcidId = other50.orcidId;
+ phones = other50.phones;
+ country = other50.country;
+ nationality = other50.nationality;
+ homeOrganization = other50.homeOrganization;
+ orginationAffiliation = other50.orginationAffiliation;
+ creationTime = other50.creationTime;
+ lastAccessTime = other50.lastAccessTime;
+ validUntil = other50.validUntil;
+ State = other50.State;
+ comments = other50.comments;
+ labeledURI = other50.labeledURI;
+ gpgKey = other50.gpgKey;
+ timeZone = other50.timeZone;
+ nsfDemographics = other50.nsfDemographics;
+ __isset = other50.__isset;
+ return *this;
+}
+void UserProfile::printTo(std::ostream& out) const {
+ using ::apache::thrift::to_string;
+ out << "UserProfile(";
+ out << "userModelVersion=" << to_string(userModelVersion);
+ out << ", " << "airavataInternalUserId=" << to_string(airavataInternalUserId);
+ out << ", " << "userId=" << to_string(userId);
+ out << ", " << "emails=" << to_string(emails);
+ out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
+ out << ", " << "gatewayId="; (__isset.gatewayId ? (out << to_string(gatewayId)) : (out << "<null>"));
+ out << ", " << "orcidId="; (__isset.orcidId ? (out << to_string(orcidId)) : (out << "<null>"));
+ out << ", " << "phones="; (__isset.phones ? (out << to_string(phones)) : (out << "<null>"));
+ out << ", " << "country="; (__isset.country ? (out << to_string(country)) : (out << "<null>"));
+ out << ", " << "nationality="; (__isset.nationality ? (out << to_string(nationality)) : (out << "<null>"));
+ out << ", " << "homeOrganization="; (__isset.homeOrganization ? (out << to_string(homeOrganization)) : (out << "<null>"));
+ out << ", " << "orginationAffiliation="; (__isset.orginationAffiliation ? (out << to_string(orginationAffiliation)) : (out << "<null>"));
+ out << ", " << "creationTime=" << to_string(creationTime);
+ out << ", " << "lastAccessTime=" << to_string(lastAccessTime);
+ out << ", " << "validUntil=" << to_string(validUntil);
+ out << ", " << "State=" << to_string(State);
+ out << ", " << "comments="; (__isset.comments ? (out << to_string(comments)) : (out << "<null>"));
+ out << ", " << "labeledURI="; (__isset.labeledURI ? (out << to_string(labeledURI)) : (out << "<null>"));
+ out << ", " << "gpgKey="; (__isset.gpgKey ? (out << to_string(gpgKey)) : (out << "<null>"));
+ out << ", " << "timeZone="; (__isset.timeZone ? (out << to_string(timeZone)) : (out << "<null>"));
+ out << ", " << "nsfDemographics="; (__isset.nsfDemographics ? (out << to_string(nsfDemographics)) : (out << "<null>"));
+ out << ")";
+}
+
+}}}} // namespace
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
new file mode 100644
index 0000000..0881287
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
@@ -0,0 +1,373 @@
+/**
+ * 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
+ */
+#ifndef user_profile_model_TYPES_H
+#define user_profile_model_TYPES_H
+
+#include <iosfwd>
+
+#include <thrift/Thrift.h>
+#include <thrift/TApplicationException.h>
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/transport/TTransport.h>
+
+#include <thrift/cxxfunctional.h>
+#include "airavata_commons_types.h"
+
+
+namespace apache { namespace airavata { namespace model { namespace user {
+
+struct Status {
+ enum type {
+ ACTIVE = 0,
+ CONFIRMED = 1,
+ APPROVED = 2,
+ DELETED = 3,
+ DUPLICATE = 4,
+ GRACE_PERIOD = 5,
+ INVITED = 6,
+ DENIED = 7,
+ PENDING = 8,
+ PENDING_APPROVAL = 9,
+ PENDING_CONFIRMATION = 10,
+ SUSPENDED = 11,
+ DECLINED = 12,
+ EXPIRED = 13
+ };
+};
+
+extern const std::map<int, const char*> _Status_VALUES_TO_NAMES;
+
+struct USCitizenship {
+ enum type {
+ US_CITIZEN = 0,
+ US_PERMANENT_RESIDENT = 1,
+ OTHER_NON_US_CITIZEN = 2
+ };
+};
+
+extern const std::map<int, const char*> _USCitizenship_VALUES_TO_NAMES;
+
+struct ethnicity {
+ enum type {
+ HISPANIC_LATINO = 0,
+ NOT_HISPANIC_LATINO = 1
+ };
+};
+
+extern const std::map<int, const char*> _ethnicity_VALUES_TO_NAMES;
+
+struct race {
+ enum type {
+ ASIAN = 0,
+ AMERICAN_INDIAN_OR_ALASKAN_NATIVE = 1,
+ BLACK_OR_AFRICAN_AMERICAN = 2,
+ NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER = 3,
+ WHITE = 4
+ };
+};
+
+extern const std::map<int, const char*> _race_VALUES_TO_NAMES;
+
+struct disability {
+ enum type {
+ HEARING_IMAPAIRED = 0,
+ VISUAL_IMPAIRED = 1,
+ MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT = 2,
+ OTHER_IMPAIRMENT = 3
+ };
+};
+
+extern const std::map<int, const char*> _disability_VALUES_TO_NAMES;
+
+class NSFDemographics;
+
+class UserProfile;
+
+typedef struct _NSFDemographics__isset {
+ _NSFDemographics__isset() : gender(false), usCitizenship(false), ethnicities(false), races(false), disabilities(false) {}
+ bool gender :1;
+ bool usCitizenship :1;
+ bool ethnicities :1;
+ bool races :1;
+ bool disabilities :1;
+} _NSFDemographics__isset;
+
+class NSFDemographics {
+ public:
+
+ NSFDemographics(const NSFDemographics&);
+ NSFDemographics& operator=(const NSFDemographics&);
+ NSFDemographics() : gender(), usCitizenship((USCitizenship::type)0) {
+ }
+
+ virtual ~NSFDemographics() throw();
+ std::string gender;
+ USCitizenship::type usCitizenship;
+ std::vector<ethnicity::type> ethnicities;
+ std::vector<race::type> races;
+ std::vector<disability::type> disabilities;
+
+ _NSFDemographics__isset __isset;
+
+ void __set_gender(const std::string& val);
+
+ void __set_usCitizenship(const USCitizenship::type val);
+
+ void __set_ethnicities(const std::vector<ethnicity::type> & val);
+
+ void __set_races(const std::vector<race::type> & val);
+
+ void __set_disabilities(const std::vector<disability::type> & val);
+
+ bool operator == (const NSFDemographics & rhs) const
+ {
+ if (__isset.gender != rhs.__isset.gender)
+ return false;
+ else if (__isset.gender && !(gender == rhs.gender))
+ return false;
+ if (__isset.usCitizenship != rhs.__isset.usCitizenship)
+ return false;
+ else if (__isset.usCitizenship && !(usCitizenship == rhs.usCitizenship))
+ return false;
+ if (__isset.ethnicities != rhs.__isset.ethnicities)
+ return false;
+ else if (__isset.ethnicities && !(ethnicities == rhs.ethnicities))
+ return false;
+ if (__isset.races != rhs.__isset.races)
+ return false;
+ else if (__isset.races && !(races == rhs.races))
+ return false;
+ if (__isset.disabilities != rhs.__isset.disabilities)
+ return false;
+ else if (__isset.disabilities && !(disabilities == rhs.disabilities))
+ return false;
+ return true;
+ }
+ bool operator != (const NSFDemographics &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const NSFDemographics & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ virtual void printTo(std::ostream& out) const;
+};
+
+void swap(NSFDemographics &a, NSFDemographics &b);
+
+inline std::ostream& operator<<(std::ostream& out, const NSFDemographics& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
+typedef struct _UserProfile__isset {
+ _UserProfile__isset() : userName(false), gatewayId(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
+ bool userName :1;
+ bool gatewayId :1;
+ bool orcidId :1;
+ bool phones :1;
+ bool country :1;
+ bool nationality :1;
+ bool homeOrganization :1;
+ bool orginationAffiliation :1;
+ bool comments :1;
+ bool labeledURI :1;
+ bool gpgKey :1;
+ bool timeZone :1;
+ bool nsfDemographics :1;
+} _UserProfile__isset;
+
+class UserProfile {
+ public:
+
+ UserProfile(const UserProfile&);
+ UserProfile& operator=(const UserProfile&);
+ UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), userName(), gatewayId(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
+ }
+
+ virtual ~UserProfile() throw();
+ std::string userModelVersion;
+ std::string airavataInternalUserId;
+ std::string userId;
+ std::vector<std::string> emails;
+ std::string userName;
+ std::string gatewayId;
+ std::string orcidId;
+ std::vector<std::string> phones;
+ std::string country;
+ std::vector<std::string> nationality;
+ std::string homeOrganization;
+ std::string orginationAffiliation;
+ std::string creationTime;
+ std::string lastAccessTime;
+ std::string validUntil;
+ Status::type State;
+ std::string comments;
+ std::vector<std::string> labeledURI;
+ std::string gpgKey;
+ std::string timeZone;
+ NSFDemographics nsfDemographics;
+
+ _UserProfile__isset __isset;
+
+ void __set_userModelVersion(const std::string& val);
+
+ void __set_airavataInternalUserId(const std::string& val);
+
+ void __set_userId(const std::string& val);
+
+ void __set_emails(const std::vector<std::string> & val);
+
+ void __set_userName(const std::string& val);
+
+ void __set_gatewayId(const std::string& val);
+
+ void __set_orcidId(const std::string& val);
+
+ void __set_phones(const std::vector<std::string> & val);
+
+ void __set_country(const std::string& val);
+
+ void __set_nationality(const std::vector<std::string> & val);
+
+ void __set_homeOrganization(const std::string& val);
+
+ void __set_orginationAffiliation(const std::string& val);
+
+ void __set_creationTime(const std::string& val);
+
+ void __set_lastAccessTime(const std::string& val);
+
+ void __set_validUntil(const std::string& val);
+
+ void __set_State(const Status::type val);
+
+ void __set_comments(const std::string& val);
+
+ void __set_labeledURI(const std::vector<std::string> & val);
+
+ void __set_gpgKey(const std::string& val);
+
+ void __set_timeZone(const std::string& val);
+
+ void __set_nsfDemographics(const NSFDemographics& val);
+
+ bool operator == (const UserProfile & rhs) const
+ {
+ if (!(userModelVersion == rhs.userModelVersion))
+ return false;
+ if (!(airavataInternalUserId == rhs.airavataInternalUserId))
+ return false;
+ if (!(userId == rhs.userId))
+ return false;
+ if (!(emails == rhs.emails))
+ return false;
+ if (__isset.userName != rhs.__isset.userName)
+ return false;
+ else if (__isset.userName && !(userName == rhs.userName))
+ return false;
+ if (__isset.gatewayId != rhs.__isset.gatewayId)
+ return false;
+ else if (__isset.gatewayId && !(gatewayId == rhs.gatewayId))
+ return false;
+ if (__isset.orcidId != rhs.__isset.orcidId)
+ return false;
+ else if (__isset.orcidId && !(orcidId == rhs.orcidId))
+ return false;
+ if (__isset.phones != rhs.__isset.phones)
+ return false;
+ else if (__isset.phones && !(phones == rhs.phones))
+ return false;
+ if (__isset.country != rhs.__isset.country)
+ return false;
+ else if (__isset.country && !(country == rhs.country))
+ return false;
+ if (__isset.nationality != rhs.__isset.nationality)
+ return false;
+ else if (__isset.nationality && !(nationality == rhs.nationality))
+ return false;
+ if (__isset.homeOrganization != rhs.__isset.homeOrganization)
+ return false;
+ else if (__isset.homeOrganization && !(homeOrganization == rhs.homeOrganization))
+ return false;
+ if (__isset.orginationAffiliation != rhs.__isset.orginationAffiliation)
+ return false;
+ else if (__isset.orginationAffiliation && !(orginationAffiliation == rhs.orginationAffiliation))
+ return false;
+ if (!(creationTime == rhs.creationTime))
+ return false;
+ if (!(lastAccessTime == rhs.lastAccessTime))
+ return false;
+ if (!(validUntil == rhs.validUntil))
+ return false;
+ if (!(State == rhs.State))
+ return false;
+ if (__isset.comments != rhs.__isset.comments)
+ return false;
+ else if (__isset.comments && !(comments == rhs.comments))
+ return false;
+ if (__isset.labeledURI != rhs.__isset.labeledURI)
+ return false;
+ else if (__isset.labeledURI && !(labeledURI == rhs.labeledURI))
+ return false;
+ if (__isset.gpgKey != rhs.__isset.gpgKey)
+ return false;
+ else if (__isset.gpgKey && !(gpgKey == rhs.gpgKey))
+ return false;
+ if (__isset.timeZone != rhs.__isset.timeZone)
+ return false;
+ else if (__isset.timeZone && !(timeZone == rhs.timeZone))
+ return false;
+ if (__isset.nsfDemographics != rhs.__isset.nsfDemographics)
+ return false;
+ else if (__isset.nsfDemographics && !(nsfDemographics == rhs.nsfDemographics))
+ return false;
+ return true;
+ }
+ bool operator != (const UserProfile &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const UserProfile & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ virtual void printTo(std::ostream& out) const;
+};
+
+void swap(UserProfile &a, UserProfile &b);
+
+inline std::ostream& operator<<(std::ostream& out, const UserProfile& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
+}}}} // namespace
+
+#endif
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
new file mode 100644
index 0000000..56e889b
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
@@ -0,0 +1,1079 @@
+<?php
+namespace Airavata\Model\User;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+
+final class Status {
+ const ACTIVE = 0;
+ const CONFIRMED = 1;
+ const APPROVED = 2;
+ const DELETED = 3;
+ const DUPLICATE = 4;
+ const GRACE_PERIOD = 5;
+ const INVITED = 6;
+ const DENIED = 7;
+ const PENDING = 8;
+ const PENDING_APPROVAL = 9;
+ const PENDING_CONFIRMATION = 10;
+ const SUSPENDED = 11;
+ const DECLINED = 12;
+ const EXPIRED = 13;
+ static public $__names = array(
+ 0 => 'ACTIVE',
+ 1 => 'CONFIRMED',
+ 2 => 'APPROVED',
+ 3 => 'DELETED',
+ 4 => 'DUPLICATE',
+ 5 => 'GRACE_PERIOD',
+ 6 => 'INVITED',
+ 7 => 'DENIED',
+ 8 => 'PENDING',
+ 9 => 'PENDING_APPROVAL',
+ 10 => 'PENDING_CONFIRMATION',
+ 11 => 'SUSPENDED',
+ 12 => 'DECLINED',
+ 13 => 'EXPIRED',
+ );
+}
+
+/**
+ * U.S. Citizen (see: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+ *
+ */
+final class USCitizenship {
+ const US_CITIZEN = 0;
+ const US_PERMANENT_RESIDENT = 1;
+ const OTHER_NON_US_CITIZEN = 2;
+ static public $__names = array(
+ 0 => 'US_CITIZEN',
+ 1 => 'US_PERMANENT_RESIDENT',
+ 2 => 'OTHER_NON_US_CITIZEN',
+ );
+}
+
+/**
+ * Hispanic or Latino - a person of Mexican, Puerto Rican, Cuban, South or
+ * Central American, or other Spanish culture or origin, regardless of race.
+ *
+ */
+final class ethnicity {
+ const HISPANIC_LATINO = 0;
+ const NOT_HISPANIC_LATINO = 1;
+ static public $__names = array(
+ 0 => 'HISPANIC_LATINO',
+ 1 => 'NOT_HISPANIC_LATINO',
+ );
+}
+
+/**
+ * * Asian - a person having origins in any of the original peoples of the Far East,
+ * * Southeast Asia, or the Indian subcontinent including, for example, Cambodia,
+ * * China, India, Japan, Korea, Malaysia, Pakistan, the Philippine Islands,
+ * * Thailand, and Vietnam.
+ * * American Indian or Alaskan Native - a person having origins in any of the original
+ * * peoples of North and South America (including Central America), and who maintains
+ * * tribal affiliation or community attachment.
+ * * Black or African American - a person having origins in any of the black racial groups
+ * * of Africa.
+ * * Native Hawaiian or Pacific Islander - a person having origins in any of the original
+ * * peoples of Hawaii, Guan, Samoa, or other Pacific Islands.
+ * * White - a person having origins in any of the original peoples of Europe, the Middle East, or North Africa.
+ * *
+ */
+final class race {
+ const ASIAN = 0;
+ const AMERICAN_INDIAN_OR_ALASKAN_NATIVE = 1;
+ const BLACK_OR_AFRICAN_AMERICAN = 2;
+ const NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER = 3;
+ const WHITE = 4;
+ static public $__names = array(
+ 0 => 'ASIAN',
+ 1 => 'AMERICAN_INDIAN_OR_ALASKAN_NATIVE',
+ 2 => 'BLACK_OR_AFRICAN_AMERICAN',
+ 3 => 'NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER',
+ 4 => 'WHITE',
+ );
+}
+
+final class disability {
+ const HEARING_IMAPAIRED = 0;
+ const VISUAL_IMPAIRED = 1;
+ const MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT = 2;
+ const OTHER_IMPAIRMENT = 3;
+ static public $__names = array(
+ 0 => 'HEARING_IMAPAIRED',
+ 1 => 'VISUAL_IMPAIRED',
+ 2 => 'MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT',
+ 3 => 'OTHER_IMPAIRMENT',
+ );
+}
+
+/**
+ * A structure holding the NSF Demographic information.
+ *
+ *
+ */
+class NSFDemographics {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $gender = null;
+ /**
+ * @var int
+ */
+ public $usCitizenship = null;
+ /**
+ * @var int[]
+ */
+ public $ethnicities = null;
+ /**
+ * @var int[]
+ */
+ public $races = null;
+ /**
+ * @var int[]
+ */
+ public $disabilities = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'gender',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'usCitizenship',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
+ 'var' => 'ethnicities',
+ 'type' => TType::LST,
+ 'etype' => TType::I32,
+ 'elem' => array(
+ 'type' => TType::I32,
+ ),
+ ),
+ 4 => array(
+ 'var' => 'races',
+ 'type' => TType::LST,
+ 'etype' => TType::I32,
+ 'elem' => array(
+ 'type' => TType::I32,
+ ),
+ ),
+ 5 => array(
+ 'var' => 'disabilities',
+ 'type' => TType::LST,
+ 'etype' => TType::I32,
+ 'elem' => array(
+ 'type' => TType::I32,
+ ),
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['gender'])) {
+ $this->gender = $vals['gender'];
+ }
+ if (isset($vals['usCitizenship'])) {
+ $this->usCitizenship = $vals['usCitizenship'];
+ }
+ if (isset($vals['ethnicities'])) {
+ $this->ethnicities = $vals['ethnicities'];
+ }
+ if (isset($vals['races'])) {
+ $this->races = $vals['races'];
+ }
+ if (isset($vals['disabilities'])) {
+ $this->disabilities = $vals['disabilities'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'NSFDemographics';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gender);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->usCitizenship);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::LST) {
+ $this->ethnicities = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $xfer += $input->readI32($elem5);
+ $this->ethnicities []= $elem5;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::LST) {
+ $this->races = array();
+ $_size6 = 0;
+ $_etype9 = 0;
+ $xfer += $input->readListBegin($_etype9, $_size6);
+ for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
+ {
+ $elem11 = null;
+ $xfer += $input->readI32($elem11);
+ $this->races []= $elem11;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::LST) {
+ $this->disabilities = array();
+ $_size12 = 0;
+ $_etype15 = 0;
+ $xfer += $input->readListBegin($_etype15, $_size12);
+ for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
+ {
+ $elem17 = null;
+ $xfer += $input->readI32($elem17);
+ $this->disabilities []= $elem17;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('NSFDemographics');
+ if ($this->gender !== null) {
+ $xfer += $output->writeFieldBegin('gender', TType::STRING, 1);
+ $xfer += $output->writeString($this->gender);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->usCitizenship !== null) {
+ $xfer += $output->writeFieldBegin('usCitizenship', TType::I32, 2);
+ $xfer += $output->writeI32($this->usCitizenship);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ethnicities !== null) {
+ if (!is_array($this->ethnicities)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('ethnicities', TType::LST, 3);
+ {
+ $output->writeListBegin(TType::I32, count($this->ethnicities));
+ {
+ foreach ($this->ethnicities as $iter18)
+ {
+ $xfer += $output->writeI32($iter18);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->races !== null) {
+ if (!is_array($this->races)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('races', TType::LST, 4);
+ {
+ $output->writeListBegin(TType::I32, count($this->races));
+ {
+ foreach ($this->races as $iter19)
+ {
+ $xfer += $output->writeI32($iter19);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->disabilities !== null) {
+ if (!is_array($this->disabilities)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('disabilities', TType::LST, 5);
+ {
+ $output->writeListBegin(TType::I32, count($this->disabilities));
+ {
+ foreach ($this->disabilities as $iter20)
+ {
+ $xfer += $output->writeI32($iter20);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+/**
+ * * A structure holding the user profile and its child models.
+ * *
+ * * Notes:
+ * * The model does not include passwords as it is assumed an external identity provider is used to authenticate user.
+ * * References:
+ * * NSF Demographic Information - http://www.nsf.gov/pubs/2000/00form1225/00form1225.doc
+ * * LDAP Schema - https://tools.ietf.org/html/rfc4519
+ * * SCIM 2.0 - https://tools.ietf.org/html/rfc7643
+ * *
+ * * userModelVersion:
+ * * Version number of profile
+ * *
+ * * airavataInternalUserId:
+ * * internal to Airavata, not intended to be used outside of the Airavata platform or possibly by gateways
+ * * (that is, never shown to users), never reassigned, REQUIRED
+ * *
+ * * userId:
+ * * Externally assertable unique identifier. SAML (primarly in higher education, academic) tends to keep
+ * * user name less opaque. OpenID Connect maintains them to be opaque.
+ * *
+ * * emails:
+ * * Email identifier are Verified, REQUIRED and MULTIVALUED
+ * *
+ * * userName:
+ * * Name-based identifiers can be multivalues. To keep it simple, Airavata will make it a string.
+ * * In the future these can be enumerated as:
+ * * Official name (as asserted possibly by some external identity provider)
+ * * Prefered name (as asserted or suggested by user directly)
+ * * Components:
+ * * givenName
+ * * surname (familyName)
+ * * displayName (often asserted by user to handle things like middle names, suffix, prefix, and the like)
+ * *
+ * * orcidId: ORCID ID - http://orcid.org/about/what-is-orcid)
+ * *
+ * * phones: Telephone MULTIVALUED
+ * *
+ * * country: Country of Residance
+ * *
+ * * nationality Countries of citizenship
+ * *
+ * * comments:
+ * * Free-form information (treated as opaque by Airavata and simply passed to resource).
+ * *
+ * * labeledURI:
+ * * Google Scholar, Web of Science, ACS, e.t.c
+ * *
+ * * timeZone:
+ * * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
+ * *
+ */
+class UserProfile {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $userModelVersion = "1.0";
+ /**
+ * @var string
+ */
+ public $airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS";
+ /**
+ * @var string
+ */
+ public $userId = null;
+ /**
+ * @var string[]
+ */
+ public $emails = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $orcidId = null;
+ /**
+ * @var string[]
+ */
+ public $phones = null;
+ /**
+ * @var string
+ */
+ public $country = null;
+ /**
+ * @var string[]
+ */
+ public $nationality = null;
+ /**
+ * @var string
+ */
+ public $homeOrganization = null;
+ /**
+ * @var string
+ */
+ public $orginationAffiliation = null;
+ /**
+ * @var string
+ */
+ public $creationTime = null;
+ /**
+ * @var string
+ */
+ public $lastAccessTime = null;
+ /**
+ * @var string
+ */
+ public $validUntil = null;
+ /**
+ * @var int
+ */
+ public $State = null;
+ /**
+ * @var string
+ */
+ public $comments = null;
+ /**
+ * @var string[]
+ */
+ public $labeledURI = null;
+ /**
+ * @var string
+ */
+ public $gpgKey = null;
+ /**
+ * @var string
+ */
+ public $timeZone = null;
+ /**
+ * @var \Airavata\Model\User\NSFDemographics
+ */
+ public $nsfDemographics = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'userModelVersion',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'airavataInternalUserId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userId',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'emails',
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 5 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'orcidId',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
+ 'var' => 'phones',
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 9 => array(
+ 'var' => 'country',
+ 'type' => TType::STRING,
+ ),
+ 10 => array(
+ 'var' => 'nationality',
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 11 => array(
+ 'var' => 'homeOrganization',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
+ 'var' => 'orginationAffiliation',
+ 'type' => TType::STRING,
+ ),
+ 13 => array(
+ 'var' => 'creationTime',
+ 'type' => TType::STRING,
+ ),
+ 14 => array(
+ 'var' => 'lastAccessTime',
+ 'type' => TType::STRING,
+ ),
+ 15 => array(
+ 'var' => 'validUntil',
+ 'type' => TType::STRING,
+ ),
+ 16 => array(
+ 'var' => 'State',
+ 'type' => TType::I32,
+ ),
+ 17 => array(
+ 'var' => 'comments',
+ 'type' => TType::STRING,
+ ),
+ 18 => array(
+ 'var' => 'labeledURI',
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 19 => array(
+ 'var' => 'gpgKey',
+ 'type' => TType::STRING,
+ ),
+ 20 => array(
+ 'var' => 'timeZone',
+ 'type' => TType::STRING,
+ ),
+ 21 => array(
+ 'var' => 'nsfDemographics',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\User\NSFDemographics',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['userModelVersion'])) {
+ $this->userModelVersion = $vals['userModelVersion'];
+ }
+ if (isset($vals['airavataInternalUserId'])) {
+ $this->airavataInternalUserId = $vals['airavataInternalUserId'];
+ }
+ if (isset($vals['userId'])) {
+ $this->userId = $vals['userId'];
+ }
+ if (isset($vals['emails'])) {
+ $this->emails = $vals['emails'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['orcidId'])) {
+ $this->orcidId = $vals['orcidId'];
+ }
+ if (isset($vals['phones'])) {
+ $this->phones = $vals['phones'];
+ }
+ if (isset($vals['country'])) {
+ $this->country = $vals['country'];
+ }
+ if (isset($vals['nationality'])) {
+ $this->nationality = $vals['nationality'];
+ }
+ if (isset($vals['homeOrganization'])) {
+ $this->homeOrganization = $vals['homeOrganization'];
+ }
+ if (isset($vals['orginationAffiliation'])) {
+ $this->orginationAffiliation = $vals['orginationAffiliation'];
+ }
+ if (isset($vals['creationTime'])) {
+ $this->creationTime = $vals['creationTime'];
+ }
+ if (isset($vals['lastAccessTime'])) {
+ $this->lastAccessTime = $vals['lastAccessTime'];
+ }
+ if (isset($vals['validUntil'])) {
+ $this->validUntil = $vals['validUntil'];
+ }
+ if (isset($vals['State'])) {
+ $this->State = $vals['State'];
+ }
+ if (isset($vals['comments'])) {
+ $this->comments = $vals['comments'];
+ }
+ if (isset($vals['labeledURI'])) {
+ $this->labeledURI = $vals['labeledURI'];
+ }
+ if (isset($vals['gpgKey'])) {
+ $this->gpgKey = $vals['gpgKey'];
+ }
+ if (isset($vals['timeZone'])) {
+ $this->timeZone = $vals['timeZone'];
+ }
+ if (isset($vals['nsfDemographics'])) {
+ $this->nsfDemographics = $vals['nsfDemographics'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'UserProfile';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userModelVersion);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->airavataInternalUserId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::LST) {
+ $this->emails = array();
+ $_size21 = 0;
+ $_etype24 = 0;
+ $xfer += $input->readListBegin($_etype24, $_size21);
+ for ($_i25 = 0; $_i25 < $_size21; ++$_i25)
+ {
+ $elem26 = null;
+ $xfer += $input->readString($elem26);
+ $this->emails []= $elem26;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->orcidId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::LST) {
+ $this->phones = array();
+ $_size27 = 0;
+ $_etype30 = 0;
+ $xfer += $input->readListBegin($_etype30, $_size27);
+ for ($_i31 = 0; $_i31 < $_size27; ++$_i31)
+ {
+ $elem32 = null;
+ $xfer += $input->readString($elem32);
+ $this->phones []= $elem32;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->country);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 10:
+ if ($ftype == TType::LST) {
+ $this->nationality = array();
+ $_size33 = 0;
+ $_etype36 = 0;
+ $xfer += $input->readListBegin($_etype36, $_size33);
+ for ($_i37 = 0; $_i37 < $_size33; ++$_i37)
+ {
+ $elem38 = null;
+ $xfer += $input->readString($elem38);
+ $this->nationality []= $elem38;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->homeOrganization);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->orginationAffiliation);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->creationTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->lastAccessTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 15:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->validUntil);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 16:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->State);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->comments);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 18:
+ if ($ftype == TType::LST) {
+ $this->labeledURI = array();
+ $_size39 = 0;
+ $_etype42 = 0;
+ $xfer += $input->readListBegin($_etype42, $_size39);
+ for ($_i43 = 0; $_i43 < $_size39; ++$_i43)
+ {
+ $elem44 = null;
+ $xfer += $input->readString($elem44);
+ $this->labeledURI []= $elem44;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 19:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gpgKey);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 20:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->timeZone);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 21:
+ if ($ftype == TType::STRUCT) {
+ $this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
+ $xfer += $this->nsfDemographics->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('UserProfile');
+ if ($this->userModelVersion !== null) {
+ $xfer += $output->writeFieldBegin('userModelVersion', TType::STRING, 1);
+ $xfer += $output->writeString($this->userModelVersion);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->airavataInternalUserId !== null) {
+ $xfer += $output->writeFieldBegin('airavataInternalUserId', TType::STRING, 2);
+ $xfer += $output->writeString($this->airavataInternalUserId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->userId !== null) {
+ $xfer += $output->writeFieldBegin('userId', TType::STRING, 3);
+ $xfer += $output->writeString($this->userId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->emails !== null) {
+ if (!is_array($this->emails)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('emails', TType::LST, 4);
+ {
+ $output->writeListBegin(TType::STRING, count($this->emails));
+ {
+ foreach ($this->emails as $iter45)
+ {
+ $xfer += $output->writeString($iter45);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 5);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 6);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->orcidId !== null) {
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 7);
+ $xfer += $output->writeString($this->orcidId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->phones !== null) {
+ if (!is_array($this->phones)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('phones', TType::LST, 8);
+ {
+ $output->writeListBegin(TType::STRING, count($this->phones));
+ {
+ foreach ($this->phones as $iter46)
+ {
+ $xfer += $output->writeString($iter46);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->country !== null) {
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 9);
+ $xfer += $output->writeString($this->country);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->nationality !== null) {
+ if (!is_array($this->nationality)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('nationality', TType::LST, 10);
+ {
+ $output->writeListBegin(TType::STRING, count($this->nationality));
+ {
+ foreach ($this->nationality as $iter47)
+ {
+ $xfer += $output->writeString($iter47);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->homeOrganization !== null) {
+ $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 11);
+ $xfer += $output->writeString($this->homeOrganization);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->orginationAffiliation !== null) {
+ $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 12);
+ $xfer += $output->writeString($this->orginationAffiliation);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->creationTime !== null) {
+ $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 13);
+ $xfer += $output->writeString($this->creationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->lastAccessTime !== null) {
+ $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 14);
+ $xfer += $output->writeString($this->lastAccessTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->validUntil !== null) {
+ $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 15);
+ $xfer += $output->writeString($this->validUntil);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->State !== null) {
+ $xfer += $output->writeFieldBegin('State', TType::I32, 16);
+ $xfer += $output->writeI32($this->State);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->comments !== null) {
+ $xfer += $output->writeFieldBegin('comments', TType::STRING, 17);
+ $xfer += $output->writeString($this->comments);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->labeledURI !== null) {
+ if (!is_array($this->labeledURI)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 18);
+ {
+ $output->writeListBegin(TType::STRING, count($this->labeledURI));
+ {
+ foreach ($this->labeledURI as $iter48)
+ {
+ $xfer += $output->writeString($iter48);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gpgKey !== null) {
+ $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 19);
+ $xfer += $output->writeString($this->gpgKey);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->timeZone !== null) {
+ $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 20);
+ $xfer += $output->writeString($this->timeZone);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->nsfDemographics !== null) {
+ if (!is_object($this->nsfDemographics)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 21);
+ $xfer += $this->nsfDemographics->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+final class Constant extends \Thrift\Type\TConstant {
+ static protected $USER_PROFILE_VERSION;
+
+ static protected function init_USER_PROFILE_VERSION() {
+ return "1.0";
+ }
+}
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/__init__.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/__init__.py
new file mode 100644
index 0000000..adefd8e
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/__init__.py
@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants']
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/constants.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/constants.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/constants.py
new file mode 100644
index 0000000..e3e9481
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/constants.py
@@ -0,0 +1,12 @@
+#
+# Autogenerated by Thrift Compiler (0.9.3)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+# options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+from ttypes import *
+
+USER_PROFILE_VERSION = "1.0"
[13/18] airavata git commit: adding user profile thrift generated
files
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
new file mode 100644
index 0000000..277a3e5
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -0,0 +1,2766 @@
+/**
+ * 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.user;
+
+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"})
+/**
+ * * A structure holding the user profile and its child models.
+ * *
+ * * Notes:
+ * * The model does not include passwords as it is assumed an external identity provider is used to authenticate user.
+ * * References:
+ * * NSF Demographic Information - http://www.nsf.gov/pubs/2000/00form1225/00form1225.doc
+ * * LDAP Schema - https://tools.ietf.org/html/rfc4519
+ * * SCIM 2.0 - https://tools.ietf.org/html/rfc7643
+ * *
+ * * userModelVersion:
+ * * Version number of profile
+ * *
+ * * airavataInternalUserId:
+ * * internal to Airavata, not intended to be used outside of the Airavata platform or possibly by gateways
+ * * (that is, never shown to users), never reassigned, REQUIRED
+ * *
+ * * userId:
+ * * Externally assertable unique identifier. SAML (primarly in higher education, academic) tends to keep
+ * * user name less opaque. OpenID Connect maintains them to be opaque.
+ * *
+ * * emails:
+ * * Email identifier are Verified, REQUIRED and MULTIVALUED
+ * *
+ * * userName:
+ * * Name-based identifiers can be multivalues. To keep it simple, Airavata will make it a string.
+ * * In the future these can be enumerated as:
+ * * Official name (as asserted possibly by some external identity provider)
+ * * Prefered name (as asserted or suggested by user directly)
+ * * Components:
+ * * givenName
+ * * surname (familyName)
+ * * displayName (often asserted by user to handle things like middle names, suffix, prefix, and the like)
+ * *
+ * * orcidId: ORCID ID - http://orcid.org/about/what-is-orcid)
+ * *
+ * * phones: Telephone MULTIVALUED
+ * *
+ * * country: Country of Residance
+ * *
+ * * nationality Countries of citizenship
+ * *
+ * * comments:
+ * * Free-form information (treated as opaque by Airavata and simply passed to resource).
+ * *
+ * * labeledURI:
+ * * Google Scholar, Web of Science, ACS, e.t.c
+ * *
+ * * timeZone:
+ * * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
+ * *
+ */
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-13")
+public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
+
+ private static final org.apache.thrift.protocol.TField USER_MODEL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("userModelVersion", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField AIRAVATA_INTERNAL_USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataInternalUserId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField EMAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("emails", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)5);
+ 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)6);
+ private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("orcidId", org.apache.thrift.protocol.TType.STRING, (short)7);
+ private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = new org.apache.thrift.protocol.TField("phones", org.apache.thrift.protocol.TType.LIST, (short)8);
+ private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("country", org.apache.thrift.protocol.TType.STRING, (short)9);
+ private static final org.apache.thrift.protocol.TField NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", org.apache.thrift.protocol.TType.LIST, (short)10);
+ private static final org.apache.thrift.protocol.TField HOME_ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("homeOrganization", org.apache.thrift.protocol.TType.STRING, (short)11);
+ private static final org.apache.thrift.protocol.TField ORGINATION_AFFILIATION_FIELD_DESC = new org.apache.thrift.protocol.TField("orginationAffiliation", org.apache.thrift.protocol.TType.STRING, (short)12);
+ private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.STRING, (short)13);
+ private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.STRING, (short)14);
+ private static final org.apache.thrift.protocol.TField VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", org.apache.thrift.protocol.TType.STRING, (short)15);
+ private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("State", org.apache.thrift.protocol.TType.I32, (short)16);
+ private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("comments", org.apache.thrift.protocol.TType.STRING, (short)17);
+ private static final org.apache.thrift.protocol.TField LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", org.apache.thrift.protocol.TType.LIST, (short)18);
+ private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("gpgKey", org.apache.thrift.protocol.TType.STRING, (short)19);
+ private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC = new org.apache.thrift.protocol.TField("timeZone", org.apache.thrift.protocol.TType.STRING, (short)20);
+ private static final org.apache.thrift.protocol.TField NSF_DEMOGRAPHICS_FIELD_DESC = new org.apache.thrift.protocol.TField("nsfDemographics", org.apache.thrift.protocol.TType.STRUCT, (short)21);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new UserProfileStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new UserProfileTupleSchemeFactory());
+ }
+
+ private String userModelVersion; // required
+ private String airavataInternalUserId; // required
+ private String userId; // required
+ private List<String> emails; // required
+ private String userName; // optional
+ private String gatewayId; // optional
+ private String orcidId; // optional
+ private List<String> phones; // optional
+ private String country; // optional
+ private List<String> nationality; // optional
+ private String homeOrganization; // optional
+ private String orginationAffiliation; // optional
+ private String creationTime; // required
+ private String lastAccessTime; // required
+ private String validUntil; // required
+ private Status State; // required
+ private String comments; // optional
+ private List<String> labeledURI; // optional
+ private String gpgKey; // optional
+ private String timeZone; // optional
+ private NSFDemographics nsfDemographics; // 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 {
+ USER_MODEL_VERSION((short)1, "userModelVersion"),
+ AIRAVATA_INTERNAL_USER_ID((short)2, "airavataInternalUserId"),
+ USER_ID((short)3, "userId"),
+ EMAILS((short)4, "emails"),
+ USER_NAME((short)5, "userName"),
+ GATEWAY_ID((short)6, "gatewayId"),
+ ORCID_ID((short)7, "orcidId"),
+ PHONES((short)8, "phones"),
+ COUNTRY((short)9, "country"),
+ NATIONALITY((short)10, "nationality"),
+ HOME_ORGANIZATION((short)11, "homeOrganization"),
+ ORGINATION_AFFILIATION((short)12, "orginationAffiliation"),
+ CREATION_TIME((short)13, "creationTime"),
+ LAST_ACCESS_TIME((short)14, "lastAccessTime"),
+ VALID_UNTIL((short)15, "validUntil"),
+ /**
+ *
+ * @see Status
+ */
+ STATE((short)16, "State"),
+ COMMENTS((short)17, "comments"),
+ LABELED_URI((short)18, "labeledURI"),
+ GPG_KEY((short)19, "gpgKey"),
+ TIME_ZONE((short)20, "timeZone"),
+ NSF_DEMOGRAPHICS((short)21, "nsfDemographics");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // USER_MODEL_VERSION
+ return USER_MODEL_VERSION;
+ case 2: // AIRAVATA_INTERNAL_USER_ID
+ return AIRAVATA_INTERNAL_USER_ID;
+ case 3: // USER_ID
+ return USER_ID;
+ case 4: // EMAILS
+ return EMAILS;
+ case 5: // USER_NAME
+ return USER_NAME;
+ case 6: // GATEWAY_ID
+ return GATEWAY_ID;
+ case 7: // ORCID_ID
+ return ORCID_ID;
+ case 8: // PHONES
+ return PHONES;
+ case 9: // COUNTRY
+ return COUNTRY;
+ case 10: // NATIONALITY
+ return NATIONALITY;
+ case 11: // HOME_ORGANIZATION
+ return HOME_ORGANIZATION;
+ case 12: // ORGINATION_AFFILIATION
+ return ORGINATION_AFFILIATION;
+ case 13: // CREATION_TIME
+ return CREATION_TIME;
+ case 14: // LAST_ACCESS_TIME
+ return LAST_ACCESS_TIME;
+ case 15: // VALID_UNTIL
+ return VALID_UNTIL;
+ case 16: // STATE
+ return STATE;
+ case 17: // COMMENTS
+ return COMMENTS;
+ case 18: // LABELED_URI
+ return LABELED_URI;
+ case 19: // GPG_KEY
+ return GPG_KEY;
+ case 20: // TIME_ZONE
+ return TIME_ZONE;
+ case 21: // NSF_DEMOGRAPHICS
+ return NSF_DEMOGRAPHICS;
+ 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 _Fields optionals[] = {_Fields.USER_NAME,_Fields.GATEWAY_ID,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
+ 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.USER_MODEL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("userModelVersion", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.AIRAVATA_INTERNAL_USER_ID, new org.apache.thrift.meta_data.FieldMetaData("airavataInternalUserId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.EMAILS, new org.apache.thrift.meta_data.FieldMetaData("emails", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.ORCID_ID, new org.apache.thrift.meta_data.FieldMetaData("orcidId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.PHONES, new org.apache.thrift.meta_data.FieldMetaData("phones", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.COUNTRY, new org.apache.thrift.meta_data.FieldMetaData("country", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.NATIONALITY, new org.apache.thrift.meta_data.FieldMetaData("nationality", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.HOME_ORGANIZATION, new org.apache.thrift.meta_data.FieldMetaData("homeOrganization", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.ORGINATION_AFFILIATION, new org.apache.thrift.meta_data.FieldMetaData("orginationAffiliation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.LAST_ACCESS_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastAccessTime", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.VALID_UNTIL, new org.apache.thrift.meta_data.FieldMetaData("validUntil", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("State", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, Status.class)));
+ tmpMap.put(_Fields.COMMENTS, new org.apache.thrift.meta_data.FieldMetaData("comments", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.LABELED_URI, new org.apache.thrift.meta_data.FieldMetaData("labeledURI", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.GPG_KEY, new org.apache.thrift.meta_data.FieldMetaData("gpgKey", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.TIME_ZONE, new org.apache.thrift.meta_data.FieldMetaData("timeZone", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.NSF_DEMOGRAPHICS, new org.apache.thrift.meta_data.FieldMetaData("nsfDemographics", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NSFDemographics.class)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserProfile.class, metaDataMap);
+ }
+
+ public UserProfile() {
+ this.userModelVersion = "1.0";
+
+ this.airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS";
+
+ }
+
+ public UserProfile(
+ String userModelVersion,
+ String airavataInternalUserId,
+ String userId,
+ List<String> emails,
+ String creationTime,
+ String lastAccessTime,
+ String validUntil,
+ Status State)
+ {
+ this();
+ this.userModelVersion = userModelVersion;
+ this.airavataInternalUserId = airavataInternalUserId;
+ this.userId = userId;
+ this.emails = emails;
+ this.creationTime = creationTime;
+ this.lastAccessTime = lastAccessTime;
+ this.validUntil = validUntil;
+ this.State = State;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public UserProfile(UserProfile other) {
+ if (other.isSetUserModelVersion()) {
+ this.userModelVersion = other.userModelVersion;
+ }
+ if (other.isSetAiravataInternalUserId()) {
+ this.airavataInternalUserId = other.airavataInternalUserId;
+ }
+ if (other.isSetUserId()) {
+ this.userId = other.userId;
+ }
+ if (other.isSetEmails()) {
+ List<String> __this__emails = new ArrayList<String>(other.emails);
+ this.emails = __this__emails;
+ }
+ if (other.isSetUserName()) {
+ this.userName = other.userName;
+ }
+ if (other.isSetGatewayId()) {
+ this.gatewayId = other.gatewayId;
+ }
+ if (other.isSetOrcidId()) {
+ this.orcidId = other.orcidId;
+ }
+ if (other.isSetPhones()) {
+ List<String> __this__phones = new ArrayList<String>(other.phones);
+ this.phones = __this__phones;
+ }
+ if (other.isSetCountry()) {
+ this.country = other.country;
+ }
+ if (other.isSetNationality()) {
+ List<String> __this__nationality = new ArrayList<String>(other.nationality);
+ this.nationality = __this__nationality;
+ }
+ if (other.isSetHomeOrganization()) {
+ this.homeOrganization = other.homeOrganization;
+ }
+ if (other.isSetOrginationAffiliation()) {
+ this.orginationAffiliation = other.orginationAffiliation;
+ }
+ if (other.isSetCreationTime()) {
+ this.creationTime = other.creationTime;
+ }
+ if (other.isSetLastAccessTime()) {
+ this.lastAccessTime = other.lastAccessTime;
+ }
+ if (other.isSetValidUntil()) {
+ this.validUntil = other.validUntil;
+ }
+ if (other.isSetState()) {
+ this.State = other.State;
+ }
+ if (other.isSetComments()) {
+ this.comments = other.comments;
+ }
+ if (other.isSetLabeledURI()) {
+ List<String> __this__labeledURI = new ArrayList<String>(other.labeledURI);
+ this.labeledURI = __this__labeledURI;
+ }
+ if (other.isSetGpgKey()) {
+ this.gpgKey = other.gpgKey;
+ }
+ if (other.isSetTimeZone()) {
+ this.timeZone = other.timeZone;
+ }
+ if (other.isSetNsfDemographics()) {
+ this.nsfDemographics = new NSFDemographics(other.nsfDemographics);
+ }
+ }
+
+ public UserProfile deepCopy() {
+ return new UserProfile(this);
+ }
+
+ @Override
+ public void clear() {
+ this.userModelVersion = "1.0";
+
+ this.airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS";
+
+ this.userId = null;
+ this.emails = null;
+ this.userName = null;
+ this.gatewayId = null;
+ this.orcidId = null;
+ this.phones = null;
+ this.country = null;
+ this.nationality = null;
+ this.homeOrganization = null;
+ this.orginationAffiliation = null;
+ this.creationTime = null;
+ this.lastAccessTime = null;
+ this.validUntil = null;
+ this.State = null;
+ this.comments = null;
+ this.labeledURI = null;
+ this.gpgKey = null;
+ this.timeZone = null;
+ this.nsfDemographics = null;
+ }
+
+ public String getUserModelVersion() {
+ return this.userModelVersion;
+ }
+
+ public void setUserModelVersion(String userModelVersion) {
+ this.userModelVersion = userModelVersion;
+ }
+
+ public void unsetUserModelVersion() {
+ this.userModelVersion = null;
+ }
+
+ /** Returns true if field userModelVersion is set (has been assigned a value) and false otherwise */
+ public boolean isSetUserModelVersion() {
+ return this.userModelVersion != null;
+ }
+
+ public void setUserModelVersionIsSet(boolean value) {
+ if (!value) {
+ this.userModelVersion = null;
+ }
+ }
+
+ public String getAiravataInternalUserId() {
+ return this.airavataInternalUserId;
+ }
+
+ public void setAiravataInternalUserId(String airavataInternalUserId) {
+ this.airavataInternalUserId = airavataInternalUserId;
+ }
+
+ public void unsetAiravataInternalUserId() {
+ this.airavataInternalUserId = null;
+ }
+
+ /** Returns true if field airavataInternalUserId is set (has been assigned a value) and false otherwise */
+ public boolean isSetAiravataInternalUserId() {
+ return this.airavataInternalUserId != null;
+ }
+
+ public void setAiravataInternalUserIdIsSet(boolean value) {
+ if (!value) {
+ this.airavataInternalUserId = null;
+ }
+ }
+
+ public String getUserId() {
+ return this.userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public void unsetUserId() {
+ this.userId = null;
+ }
+
+ /** Returns true if field userId is set (has been assigned a value) and false otherwise */
+ public boolean isSetUserId() {
+ return this.userId != null;
+ }
+
+ public void setUserIdIsSet(boolean value) {
+ if (!value) {
+ this.userId = null;
+ }
+ }
+
+ public int getEmailsSize() {
+ return (this.emails == null) ? 0 : this.emails.size();
+ }
+
+ public java.util.Iterator<String> getEmailsIterator() {
+ return (this.emails == null) ? null : this.emails.iterator();
+ }
+
+ public void addToEmails(String elem) {
+ if (this.emails == null) {
+ this.emails = new ArrayList<String>();
+ }
+ this.emails.add(elem);
+ }
+
+ public List<String> getEmails() {
+ return this.emails;
+ }
+
+ public void setEmails(List<String> emails) {
+ this.emails = emails;
+ }
+
+ public void unsetEmails() {
+ this.emails = null;
+ }
+
+ /** Returns true if field emails is set (has been assigned a value) and false otherwise */
+ public boolean isSetEmails() {
+ return this.emails != null;
+ }
+
+ public void setEmailsIsSet(boolean value) {
+ if (!value) {
+ this.emails = 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 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 getOrcidId() {
+ return this.orcidId;
+ }
+
+ public void setOrcidId(String orcidId) {
+ this.orcidId = orcidId;
+ }
+
+ public void unsetOrcidId() {
+ this.orcidId = null;
+ }
+
+ /** Returns true if field orcidId is set (has been assigned a value) and false otherwise */
+ public boolean isSetOrcidId() {
+ return this.orcidId != null;
+ }
+
+ public void setOrcidIdIsSet(boolean value) {
+ if (!value) {
+ this.orcidId = null;
+ }
+ }
+
+ public int getPhonesSize() {
+ return (this.phones == null) ? 0 : this.phones.size();
+ }
+
+ public java.util.Iterator<String> getPhonesIterator() {
+ return (this.phones == null) ? null : this.phones.iterator();
+ }
+
+ public void addToPhones(String elem) {
+ if (this.phones == null) {
+ this.phones = new ArrayList<String>();
+ }
+ this.phones.add(elem);
+ }
+
+ public List<String> getPhones() {
+ return this.phones;
+ }
+
+ public void setPhones(List<String> phones) {
+ this.phones = phones;
+ }
+
+ public void unsetPhones() {
+ this.phones = null;
+ }
+
+ /** Returns true if field phones is set (has been assigned a value) and false otherwise */
+ public boolean isSetPhones() {
+ return this.phones != null;
+ }
+
+ public void setPhonesIsSet(boolean value) {
+ if (!value) {
+ this.phones = null;
+ }
+ }
+
+ public String getCountry() {
+ return this.country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ public void unsetCountry() {
+ this.country = null;
+ }
+
+ /** Returns true if field country is set (has been assigned a value) and false otherwise */
+ public boolean isSetCountry() {
+ return this.country != null;
+ }
+
+ public void setCountryIsSet(boolean value) {
+ if (!value) {
+ this.country = null;
+ }
+ }
+
+ public int getNationalitySize() {
+ return (this.nationality == null) ? 0 : this.nationality.size();
+ }
+
+ public java.util.Iterator<String> getNationalityIterator() {
+ return (this.nationality == null) ? null : this.nationality.iterator();
+ }
+
+ public void addToNationality(String elem) {
+ if (this.nationality == null) {
+ this.nationality = new ArrayList<String>();
+ }
+ this.nationality.add(elem);
+ }
+
+ public List<String> getNationality() {
+ return this.nationality;
+ }
+
+ public void setNationality(List<String> nationality) {
+ this.nationality = nationality;
+ }
+
+ public void unsetNationality() {
+ this.nationality = null;
+ }
+
+ /** Returns true if field nationality is set (has been assigned a value) and false otherwise */
+ public boolean isSetNationality() {
+ return this.nationality != null;
+ }
+
+ public void setNationalityIsSet(boolean value) {
+ if (!value) {
+ this.nationality = null;
+ }
+ }
+
+ public String getHomeOrganization() {
+ return this.homeOrganization;
+ }
+
+ public void setHomeOrganization(String homeOrganization) {
+ this.homeOrganization = homeOrganization;
+ }
+
+ public void unsetHomeOrganization() {
+ this.homeOrganization = null;
+ }
+
+ /** Returns true if field homeOrganization is set (has been assigned a value) and false otherwise */
+ public boolean isSetHomeOrganization() {
+ return this.homeOrganization != null;
+ }
+
+ public void setHomeOrganizationIsSet(boolean value) {
+ if (!value) {
+ this.homeOrganization = null;
+ }
+ }
+
+ public String getOrginationAffiliation() {
+ return this.orginationAffiliation;
+ }
+
+ public void setOrginationAffiliation(String orginationAffiliation) {
+ this.orginationAffiliation = orginationAffiliation;
+ }
+
+ public void unsetOrginationAffiliation() {
+ this.orginationAffiliation = null;
+ }
+
+ /** Returns true if field orginationAffiliation is set (has been assigned a value) and false otherwise */
+ public boolean isSetOrginationAffiliation() {
+ return this.orginationAffiliation != null;
+ }
+
+ public void setOrginationAffiliationIsSet(boolean value) {
+ if (!value) {
+ this.orginationAffiliation = null;
+ }
+ }
+
+ public String getCreationTime() {
+ return this.creationTime;
+ }
+
+ public void setCreationTime(String creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ public void unsetCreationTime() {
+ this.creationTime = null;
+ }
+
+ /** Returns true if field creationTime is set (has been assigned a value) and false otherwise */
+ public boolean isSetCreationTime() {
+ return this.creationTime != null;
+ }
+
+ public void setCreationTimeIsSet(boolean value) {
+ if (!value) {
+ this.creationTime = null;
+ }
+ }
+
+ public String getLastAccessTime() {
+ return this.lastAccessTime;
+ }
+
+ public void setLastAccessTime(String lastAccessTime) {
+ this.lastAccessTime = lastAccessTime;
+ }
+
+ public void unsetLastAccessTime() {
+ this.lastAccessTime = null;
+ }
+
+ /** Returns true if field lastAccessTime is set (has been assigned a value) and false otherwise */
+ public boolean isSetLastAccessTime() {
+ return this.lastAccessTime != null;
+ }
+
+ public void setLastAccessTimeIsSet(boolean value) {
+ if (!value) {
+ this.lastAccessTime = null;
+ }
+ }
+
+ public String getValidUntil() {
+ return this.validUntil;
+ }
+
+ public void setValidUntil(String validUntil) {
+ this.validUntil = validUntil;
+ }
+
+ public void unsetValidUntil() {
+ this.validUntil = null;
+ }
+
+ /** Returns true if field validUntil is set (has been assigned a value) and false otherwise */
+ public boolean isSetValidUntil() {
+ return this.validUntil != null;
+ }
+
+ public void setValidUntilIsSet(boolean value) {
+ if (!value) {
+ this.validUntil = null;
+ }
+ }
+
+ /**
+ *
+ * @see Status
+ */
+ public Status getState() {
+ return this.State;
+ }
+
+ /**
+ *
+ * @see Status
+ */
+ public void setState(Status State) {
+ this.State = State;
+ }
+
+ public void unsetState() {
+ this.State = null;
+ }
+
+ /** Returns true if field State is set (has been assigned a value) and false otherwise */
+ public boolean isSetState() {
+ return this.State != null;
+ }
+
+ public void setStateIsSet(boolean value) {
+ if (!value) {
+ this.State = null;
+ }
+ }
+
+ public String getComments() {
+ return this.comments;
+ }
+
+ public void setComments(String comments) {
+ this.comments = comments;
+ }
+
+ public void unsetComments() {
+ this.comments = null;
+ }
+
+ /** Returns true if field comments is set (has been assigned a value) and false otherwise */
+ public boolean isSetComments() {
+ return this.comments != null;
+ }
+
+ public void setCommentsIsSet(boolean value) {
+ if (!value) {
+ this.comments = null;
+ }
+ }
+
+ public int getLabeledURISize() {
+ return (this.labeledURI == null) ? 0 : this.labeledURI.size();
+ }
+
+ public java.util.Iterator<String> getLabeledURIIterator() {
+ return (this.labeledURI == null) ? null : this.labeledURI.iterator();
+ }
+
+ public void addToLabeledURI(String elem) {
+ if (this.labeledURI == null) {
+ this.labeledURI = new ArrayList<String>();
+ }
+ this.labeledURI.add(elem);
+ }
+
+ public List<String> getLabeledURI() {
+ return this.labeledURI;
+ }
+
+ public void setLabeledURI(List<String> labeledURI) {
+ this.labeledURI = labeledURI;
+ }
+
+ public void unsetLabeledURI() {
+ this.labeledURI = null;
+ }
+
+ /** Returns true if field labeledURI is set (has been assigned a value) and false otherwise */
+ public boolean isSetLabeledURI() {
+ return this.labeledURI != null;
+ }
+
+ public void setLabeledURIIsSet(boolean value) {
+ if (!value) {
+ this.labeledURI = null;
+ }
+ }
+
+ public String getGpgKey() {
+ return this.gpgKey;
+ }
+
+ public void setGpgKey(String gpgKey) {
+ this.gpgKey = gpgKey;
+ }
+
+ public void unsetGpgKey() {
+ this.gpgKey = null;
+ }
+
+ /** Returns true if field gpgKey is set (has been assigned a value) and false otherwise */
+ public boolean isSetGpgKey() {
+ return this.gpgKey != null;
+ }
+
+ public void setGpgKeyIsSet(boolean value) {
+ if (!value) {
+ this.gpgKey = null;
+ }
+ }
+
+ public String getTimeZone() {
+ return this.timeZone;
+ }
+
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+
+ public void unsetTimeZone() {
+ this.timeZone = null;
+ }
+
+ /** Returns true if field timeZone is set (has been assigned a value) and false otherwise */
+ public boolean isSetTimeZone() {
+ return this.timeZone != null;
+ }
+
+ public void setTimeZoneIsSet(boolean value) {
+ if (!value) {
+ this.timeZone = null;
+ }
+ }
+
+ public NSFDemographics getNsfDemographics() {
+ return this.nsfDemographics;
+ }
+
+ public void setNsfDemographics(NSFDemographics nsfDemographics) {
+ this.nsfDemographics = nsfDemographics;
+ }
+
+ public void unsetNsfDemographics() {
+ this.nsfDemographics = null;
+ }
+
+ /** Returns true if field nsfDemographics is set (has been assigned a value) and false otherwise */
+ public boolean isSetNsfDemographics() {
+ return this.nsfDemographics != null;
+ }
+
+ public void setNsfDemographicsIsSet(boolean value) {
+ if (!value) {
+ this.nsfDemographics = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case USER_MODEL_VERSION:
+ if (value == null) {
+ unsetUserModelVersion();
+ } else {
+ setUserModelVersion((String)value);
+ }
+ break;
+
+ case AIRAVATA_INTERNAL_USER_ID:
+ if (value == null) {
+ unsetAiravataInternalUserId();
+ } else {
+ setAiravataInternalUserId((String)value);
+ }
+ break;
+
+ case USER_ID:
+ if (value == null) {
+ unsetUserId();
+ } else {
+ setUserId((String)value);
+ }
+ break;
+
+ case EMAILS:
+ if (value == null) {
+ unsetEmails();
+ } else {
+ setEmails((List<String>)value);
+ }
+ break;
+
+ case USER_NAME:
+ if (value == null) {
+ unsetUserName();
+ } else {
+ setUserName((String)value);
+ }
+ break;
+
+ case GATEWAY_ID:
+ if (value == null) {
+ unsetGatewayId();
+ } else {
+ setGatewayId((String)value);
+ }
+ break;
+
+ case ORCID_ID:
+ if (value == null) {
+ unsetOrcidId();
+ } else {
+ setOrcidId((String)value);
+ }
+ break;
+
+ case PHONES:
+ if (value == null) {
+ unsetPhones();
+ } else {
+ setPhones((List<String>)value);
+ }
+ break;
+
+ case COUNTRY:
+ if (value == null) {
+ unsetCountry();
+ } else {
+ setCountry((String)value);
+ }
+ break;
+
+ case NATIONALITY:
+ if (value == null) {
+ unsetNationality();
+ } else {
+ setNationality((List<String>)value);
+ }
+ break;
+
+ case HOME_ORGANIZATION:
+ if (value == null) {
+ unsetHomeOrganization();
+ } else {
+ setHomeOrganization((String)value);
+ }
+ break;
+
+ case ORGINATION_AFFILIATION:
+ if (value == null) {
+ unsetOrginationAffiliation();
+ } else {
+ setOrginationAffiliation((String)value);
+ }
+ break;
+
+ case CREATION_TIME:
+ if (value == null) {
+ unsetCreationTime();
+ } else {
+ setCreationTime((String)value);
+ }
+ break;
+
+ case LAST_ACCESS_TIME:
+ if (value == null) {
+ unsetLastAccessTime();
+ } else {
+ setLastAccessTime((String)value);
+ }
+ break;
+
+ case VALID_UNTIL:
+ if (value == null) {
+ unsetValidUntil();
+ } else {
+ setValidUntil((String)value);
+ }
+ break;
+
+ case STATE:
+ if (value == null) {
+ unsetState();
+ } else {
+ setState((Status)value);
+ }
+ break;
+
+ case COMMENTS:
+ if (value == null) {
+ unsetComments();
+ } else {
+ setComments((String)value);
+ }
+ break;
+
+ case LABELED_URI:
+ if (value == null) {
+ unsetLabeledURI();
+ } else {
+ setLabeledURI((List<String>)value);
+ }
+ break;
+
+ case GPG_KEY:
+ if (value == null) {
+ unsetGpgKey();
+ } else {
+ setGpgKey((String)value);
+ }
+ break;
+
+ case TIME_ZONE:
+ if (value == null) {
+ unsetTimeZone();
+ } else {
+ setTimeZone((String)value);
+ }
+ break;
+
+ case NSF_DEMOGRAPHICS:
+ if (value == null) {
+ unsetNsfDemographics();
+ } else {
+ setNsfDemographics((NSFDemographics)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case USER_MODEL_VERSION:
+ return getUserModelVersion();
+
+ case AIRAVATA_INTERNAL_USER_ID:
+ return getAiravataInternalUserId();
+
+ case USER_ID:
+ return getUserId();
+
+ case EMAILS:
+ return getEmails();
+
+ case USER_NAME:
+ return getUserName();
+
+ case GATEWAY_ID:
+ return getGatewayId();
+
+ case ORCID_ID:
+ return getOrcidId();
+
+ case PHONES:
+ return getPhones();
+
+ case COUNTRY:
+ return getCountry();
+
+ case NATIONALITY:
+ return getNationality();
+
+ case HOME_ORGANIZATION:
+ return getHomeOrganization();
+
+ case ORGINATION_AFFILIATION:
+ return getOrginationAffiliation();
+
+ case CREATION_TIME:
+ return getCreationTime();
+
+ case LAST_ACCESS_TIME:
+ return getLastAccessTime();
+
+ case VALID_UNTIL:
+ return getValidUntil();
+
+ case STATE:
+ return getState();
+
+ case COMMENTS:
+ return getComments();
+
+ case LABELED_URI:
+ return getLabeledURI();
+
+ case GPG_KEY:
+ return getGpgKey();
+
+ case TIME_ZONE:
+ return getTimeZone();
+
+ case NSF_DEMOGRAPHICS:
+ return getNsfDemographics();
+
+ }
+ 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 USER_MODEL_VERSION:
+ return isSetUserModelVersion();
+ case AIRAVATA_INTERNAL_USER_ID:
+ return isSetAiravataInternalUserId();
+ case USER_ID:
+ return isSetUserId();
+ case EMAILS:
+ return isSetEmails();
+ case USER_NAME:
+ return isSetUserName();
+ case GATEWAY_ID:
+ return isSetGatewayId();
+ case ORCID_ID:
+ return isSetOrcidId();
+ case PHONES:
+ return isSetPhones();
+ case COUNTRY:
+ return isSetCountry();
+ case NATIONALITY:
+ return isSetNationality();
+ case HOME_ORGANIZATION:
+ return isSetHomeOrganization();
+ case ORGINATION_AFFILIATION:
+ return isSetOrginationAffiliation();
+ case CREATION_TIME:
+ return isSetCreationTime();
+ case LAST_ACCESS_TIME:
+ return isSetLastAccessTime();
+ case VALID_UNTIL:
+ return isSetValidUntil();
+ case STATE:
+ return isSetState();
+ case COMMENTS:
+ return isSetComments();
+ case LABELED_URI:
+ return isSetLabeledURI();
+ case GPG_KEY:
+ return isSetGpgKey();
+ case TIME_ZONE:
+ return isSetTimeZone();
+ case NSF_DEMOGRAPHICS:
+ return isSetNsfDemographics();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof UserProfile)
+ return this.equals((UserProfile)that);
+ return false;
+ }
+
+ public boolean equals(UserProfile that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_userModelVersion = true && this.isSetUserModelVersion();
+ boolean that_present_userModelVersion = true && that.isSetUserModelVersion();
+ if (this_present_userModelVersion || that_present_userModelVersion) {
+ if (!(this_present_userModelVersion && that_present_userModelVersion))
+ return false;
+ if (!this.userModelVersion.equals(that.userModelVersion))
+ return false;
+ }
+
+ boolean this_present_airavataInternalUserId = true && this.isSetAiravataInternalUserId();
+ boolean that_present_airavataInternalUserId = true && that.isSetAiravataInternalUserId();
+ if (this_present_airavataInternalUserId || that_present_airavataInternalUserId) {
+ if (!(this_present_airavataInternalUserId && that_present_airavataInternalUserId))
+ return false;
+ if (!this.airavataInternalUserId.equals(that.airavataInternalUserId))
+ return false;
+ }
+
+ boolean this_present_userId = true && this.isSetUserId();
+ boolean that_present_userId = true && that.isSetUserId();
+ if (this_present_userId || that_present_userId) {
+ if (!(this_present_userId && that_present_userId))
+ return false;
+ if (!this.userId.equals(that.userId))
+ return false;
+ }
+
+ boolean this_present_emails = true && this.isSetEmails();
+ boolean that_present_emails = true && that.isSetEmails();
+ if (this_present_emails || that_present_emails) {
+ if (!(this_present_emails && that_present_emails))
+ return false;
+ if (!this.emails.equals(that.emails))
+ 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_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_orcidId = true && this.isSetOrcidId();
+ boolean that_present_orcidId = true && that.isSetOrcidId();
+ if (this_present_orcidId || that_present_orcidId) {
+ if (!(this_present_orcidId && that_present_orcidId))
+ return false;
+ if (!this.orcidId.equals(that.orcidId))
+ return false;
+ }
+
+ boolean this_present_phones = true && this.isSetPhones();
+ boolean that_present_phones = true && that.isSetPhones();
+ if (this_present_phones || that_present_phones) {
+ if (!(this_present_phones && that_present_phones))
+ return false;
+ if (!this.phones.equals(that.phones))
+ return false;
+ }
+
+ boolean this_present_country = true && this.isSetCountry();
+ boolean that_present_country = true && that.isSetCountry();
+ if (this_present_country || that_present_country) {
+ if (!(this_present_country && that_present_country))
+ return false;
+ if (!this.country.equals(that.country))
+ return false;
+ }
+
+ boolean this_present_nationality = true && this.isSetNationality();
+ boolean that_present_nationality = true && that.isSetNationality();
+ if (this_present_nationality || that_present_nationality) {
+ if (!(this_present_nationality && that_present_nationality))
+ return false;
+ if (!this.nationality.equals(that.nationality))
+ return false;
+ }
+
+ boolean this_present_homeOrganization = true && this.isSetHomeOrganization();
+ boolean that_present_homeOrganization = true && that.isSetHomeOrganization();
+ if (this_present_homeOrganization || that_present_homeOrganization) {
+ if (!(this_present_homeOrganization && that_present_homeOrganization))
+ return false;
+ if (!this.homeOrganization.equals(that.homeOrganization))
+ return false;
+ }
+
+ boolean this_present_orginationAffiliation = true && this.isSetOrginationAffiliation();
+ boolean that_present_orginationAffiliation = true && that.isSetOrginationAffiliation();
+ if (this_present_orginationAffiliation || that_present_orginationAffiliation) {
+ if (!(this_present_orginationAffiliation && that_present_orginationAffiliation))
+ return false;
+ if (!this.orginationAffiliation.equals(that.orginationAffiliation))
+ return false;
+ }
+
+ boolean this_present_creationTime = true && this.isSetCreationTime();
+ boolean that_present_creationTime = true && that.isSetCreationTime();
+ if (this_present_creationTime || that_present_creationTime) {
+ if (!(this_present_creationTime && that_present_creationTime))
+ return false;
+ if (!this.creationTime.equals(that.creationTime))
+ return false;
+ }
+
+ boolean this_present_lastAccessTime = true && this.isSetLastAccessTime();
+ boolean that_present_lastAccessTime = true && that.isSetLastAccessTime();
+ if (this_present_lastAccessTime || that_present_lastAccessTime) {
+ if (!(this_present_lastAccessTime && that_present_lastAccessTime))
+ return false;
+ if (!this.lastAccessTime.equals(that.lastAccessTime))
+ return false;
+ }
+
+ boolean this_present_validUntil = true && this.isSetValidUntil();
+ boolean that_present_validUntil = true && that.isSetValidUntil();
+ if (this_present_validUntil || that_present_validUntil) {
+ if (!(this_present_validUntil && that_present_validUntil))
+ return false;
+ if (!this.validUntil.equals(that.validUntil))
+ return false;
+ }
+
+ boolean this_present_State = true && this.isSetState();
+ boolean that_present_State = true && that.isSetState();
+ if (this_present_State || that_present_State) {
+ if (!(this_present_State && that_present_State))
+ return false;
+ if (!this.State.equals(that.State))
+ return false;
+ }
+
+ boolean this_present_comments = true && this.isSetComments();
+ boolean that_present_comments = true && that.isSetComments();
+ if (this_present_comments || that_present_comments) {
+ if (!(this_present_comments && that_present_comments))
+ return false;
+ if (!this.comments.equals(that.comments))
+ return false;
+ }
+
+ boolean this_present_labeledURI = true && this.isSetLabeledURI();
+ boolean that_present_labeledURI = true && that.isSetLabeledURI();
+ if (this_present_labeledURI || that_present_labeledURI) {
+ if (!(this_present_labeledURI && that_present_labeledURI))
+ return false;
+ if (!this.labeledURI.equals(that.labeledURI))
+ return false;
+ }
+
+ boolean this_present_gpgKey = true && this.isSetGpgKey();
+ boolean that_present_gpgKey = true && that.isSetGpgKey();
+ if (this_present_gpgKey || that_present_gpgKey) {
+ if (!(this_present_gpgKey && that_present_gpgKey))
+ return false;
+ if (!this.gpgKey.equals(that.gpgKey))
+ return false;
+ }
+
+ boolean this_present_timeZone = true && this.isSetTimeZone();
+ boolean that_present_timeZone = true && that.isSetTimeZone();
+ if (this_present_timeZone || that_present_timeZone) {
+ if (!(this_present_timeZone && that_present_timeZone))
+ return false;
+ if (!this.timeZone.equals(that.timeZone))
+ return false;
+ }
+
+ boolean this_present_nsfDemographics = true && this.isSetNsfDemographics();
+ boolean that_present_nsfDemographics = true && that.isSetNsfDemographics();
+ if (this_present_nsfDemographics || that_present_nsfDemographics) {
+ if (!(this_present_nsfDemographics && that_present_nsfDemographics))
+ return false;
+ if (!this.nsfDemographics.equals(that.nsfDemographics))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_userModelVersion = true && (isSetUserModelVersion());
+ list.add(present_userModelVersion);
+ if (present_userModelVersion)
+ list.add(userModelVersion);
+
+ boolean present_airavataInternalUserId = true && (isSetAiravataInternalUserId());
+ list.add(present_airavataInternalUserId);
+ if (present_airavataInternalUserId)
+ list.add(airavataInternalUserId);
+
+ boolean present_userId = true && (isSetUserId());
+ list.add(present_userId);
+ if (present_userId)
+ list.add(userId);
+
+ boolean present_emails = true && (isSetEmails());
+ list.add(present_emails);
+ if (present_emails)
+ list.add(emails);
+
+ boolean present_userName = true && (isSetUserName());
+ list.add(present_userName);
+ if (present_userName)
+ list.add(userName);
+
+ boolean present_gatewayId = true && (isSetGatewayId());
+ list.add(present_gatewayId);
+ if (present_gatewayId)
+ list.add(gatewayId);
+
+ boolean present_orcidId = true && (isSetOrcidId());
+ list.add(present_orcidId);
+ if (present_orcidId)
+ list.add(orcidId);
+
+ boolean present_phones = true && (isSetPhones());
+ list.add(present_phones);
+ if (present_phones)
+ list.add(phones);
+
+ boolean present_country = true && (isSetCountry());
+ list.add(present_country);
+ if (present_country)
+ list.add(country);
+
+ boolean present_nationality = true && (isSetNationality());
+ list.add(present_nationality);
+ if (present_nationality)
+ list.add(nationality);
+
+ boolean present_homeOrganization = true && (isSetHomeOrganization());
+ list.add(present_homeOrganization);
+ if (present_homeOrganization)
+ list.add(homeOrganization);
+
+ boolean present_orginationAffiliation = true && (isSetOrginationAffiliation());
+ list.add(present_orginationAffiliation);
+ if (present_orginationAffiliation)
+ list.add(orginationAffiliation);
+
+ boolean present_creationTime = true && (isSetCreationTime());
+ list.add(present_creationTime);
+ if (present_creationTime)
+ list.add(creationTime);
+
+ boolean present_lastAccessTime = true && (isSetLastAccessTime());
+ list.add(present_lastAccessTime);
+ if (present_lastAccessTime)
+ list.add(lastAccessTime);
+
+ boolean present_validUntil = true && (isSetValidUntil());
+ list.add(present_validUntil);
+ if (present_validUntil)
+ list.add(validUntil);
+
+ boolean present_State = true && (isSetState());
+ list.add(present_State);
+ if (present_State)
+ list.add(State.getValue());
+
+ boolean present_comments = true && (isSetComments());
+ list.add(present_comments);
+ if (present_comments)
+ list.add(comments);
+
+ boolean present_labeledURI = true && (isSetLabeledURI());
+ list.add(present_labeledURI);
+ if (present_labeledURI)
+ list.add(labeledURI);
+
+ boolean present_gpgKey = true && (isSetGpgKey());
+ list.add(present_gpgKey);
+ if (present_gpgKey)
+ list.add(gpgKey);
+
+ boolean present_timeZone = true && (isSetTimeZone());
+ list.add(present_timeZone);
+ if (present_timeZone)
+ list.add(timeZone);
+
+ boolean present_nsfDemographics = true && (isSetNsfDemographics());
+ list.add(present_nsfDemographics);
+ if (present_nsfDemographics)
+ list.add(nsfDemographics);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(UserProfile other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetUserModelVersion()).compareTo(other.isSetUserModelVersion());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUserModelVersion()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userModelVersion, other.userModelVersion);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAiravataInternalUserId()).compareTo(other.isSetAiravataInternalUserId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAiravataInternalUserId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.airavataInternalUserId, other.airavataInternalUserId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUserId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetEmails()).compareTo(other.isSetEmails());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetEmails()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emails, other.emails);
+ 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(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(isSetOrcidId()).compareTo(other.isSetOrcidId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetOrcidId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.orcidId, other.orcidId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetPhones()).compareTo(other.isSetPhones());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetPhones()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.phones, other.phones);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetCountry()).compareTo(other.isSetCountry());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCountry()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.country, other.country);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetNationality()).compareTo(other.isSetNationality());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetNationality()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nationality, other.nationality);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetHomeOrganization()).compareTo(other.isSetHomeOrganization());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetHomeOrganization()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.homeOrganization, other.homeOrganization);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetOrginationAffiliation()).compareTo(other.isSetOrginationAffiliation());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetOrginationAffiliation()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.orginationAffiliation, other.orginationAffiliation);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCreationTime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creationTime, other.creationTime);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetLastAccessTime()).compareTo(other.isSetLastAccessTime());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetLastAccessTime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastAccessTime, other.lastAccessTime);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetValidUntil()).compareTo(other.isSetValidUntil());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetValidUntil()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validUntil, other.validUntil);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetState()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.State, other.State);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetComments()).compareTo(other.isSetComments());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetComments()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comments, other.comments);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetLabeledURI()).compareTo(other.isSetLabeledURI());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetLabeledURI()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.labeledURI, other.labeledURI);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGpgKey()).compareTo(other.isSetGpgKey());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGpgKey()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gpgKey, other.gpgKey);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetTimeZone()).compareTo(other.isSetTimeZone());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTimeZone()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeZone, other.timeZone);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetNsfDemographics()).compareTo(other.isSetNsfDemographics());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetNsfDemographics()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nsfDemographics, other.nsfDemographics);
+ 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("UserProfile(");
+ boolean first = true;
+
+ sb.append("userModelVersion:");
+ if (this.userModelVersion == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.userModelVersion);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("airavataInternalUserId:");
+ if (this.airavataInternalUserId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.airavataInternalUserId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("userId:");
+ if (this.userId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.userId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("emails:");
+ if (this.emails == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.emails);
+ }
+ first = false;
+ if (isSetUserName()) {
+ if (!first) sb.append(", ");
+ sb.append("userName:");
+ if (this.userName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.userName);
+ }
+ first = false;
+ }
+ if (isSetGatewayId()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayId:");
+ if (this.gatewayId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayId);
+ }
+ first = false;
+ }
+ if (isSetOrcidId()) {
+ if (!first) sb.append(", ");
+ sb.append("orcidId:");
+ if (this.orcidId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.orcidId);
+ }
+ first = false;
+ }
+ if (isSetPhones()) {
+ if (!first) sb.append(", ");
+ sb.append("phones:");
+ if (this.phones == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.phones);
+ }
+ first = false;
+ }
+ if (isSetCountry()) {
+ if (!first) sb.append(", ");
+ sb.append("country:");
+ if (this.country == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.country);
+ }
+ first = false;
+ }
+ if (isSetNationality()) {
+ if (!first) sb.append(", ");
+ sb.append("nationality:");
+ if (this.nationality == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.nationality);
+ }
+ first = false;
+ }
+ if (isSetHomeOrganization()) {
+ if (!first) sb.append(", ");
+ sb.append("homeOrganization:");
+ if (this.homeOrganization == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.homeOrganization);
+ }
+ first = false;
+ }
+ if (isSetOrginationAffiliation()) {
+ if (!first) sb.append(", ");
+ sb.append("orginationAffiliation:");
+ if (this.orginationAffiliation == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.orginationAffiliation);
+ }
+ first = false;
+ }
+ if (!first) sb.append(", ");
+ sb.append("creationTime:");
+ if (this.creationTime == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.creationTime);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("lastAccessTime:");
+ if (this.lastAccessTime == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.lastAccessTime);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("validUntil:");
+ if (this.validUntil == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.validUntil);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("State:");
+ if (this.State == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.State);
+ }
+ first = false;
+ if (isSetComments()) {
+ if (!first) sb.append(", ");
+ sb.append("comments:");
+ if (this.comments == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.comments);
+ }
+ first = false;
+ }
+ if (isSetLabeledURI()) {
+ if (!first) sb.append(", ");
+ sb.append("labeledURI:");
+ if (this.labeledURI == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.labeledURI);
+ }
+ first = false;
+ }
+ if (isSetGpgKey()) {
+ if (!first) sb.append(", ");
+ sb.append("gpgKey:");
+ if (this.gpgKey == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gpgKey);
+ }
+ first = false;
+ }
+ if (isSetTimeZone()) {
+ if (!first) sb.append(", ");
+ sb.append("timeZone:");
+ if (this.timeZone == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.timeZone);
+ }
+ first = false;
+ }
+ if (isSetNsfDemographics()) {
+ if (!first) sb.append(", ");
+ sb.append("nsfDemographics:");
+ if (this.nsfDemographics == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.nsfDemographics);
+ }
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!isSetUserModelVersion()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userModelVersion' is unset! Struct:" + toString());
+ }
+
+ if (!isSetAiravataInternalUserId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataInternalUserId' is unset! Struct:" + toString());
+ }
+
+ if (!isSetUserId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userId' is unset! Struct:" + toString());
+ }
+
+ if (!isSetEmails()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'emails' is unset! Struct:" + toString());
+ }
+
+ if (!isSetCreationTime()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'creationTime' is unset! Struct:" + toString());
+ }
+
+ if (!isSetLastAccessTime()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'lastAccessTime' is unset! Struct:" + toString());
+ }
+
+ if (!isSetValidUntil()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'validUntil' is unset! Struct:" + toString());
+ }
+
+ if (!isSetState()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'State' is unset! Struct:" + toString());
+ }
+
+ // check for sub-struct validity
+ if (nsfDemographics != null) {
+ nsfDemographics.validate();
+ }
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class UserProfileStandardSchemeFactory implements SchemeFactory {
+ public UserProfileStandardScheme getScheme() {
+ return new UserProfileStandardScheme();
+ }
+ }
+
+ private static class UserProfileStandardScheme extends StandardScheme<UserProfile> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, UserProfile 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: // USER_MODEL_VERSION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.userModelVersion = iprot.readString();
+ struct.setUserModelVersionIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // AIRAVATA_INTERNAL_USER_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.airavataInternalUserId = iprot.readString();
+ struct.setAiravataInternalUserIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // USER_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.userId = iprot.readString();
+ struct.setUserIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // EMAILS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
+ struct.emails = new ArrayList<String>(_list24.size);
+ String _elem25;
+ for (int _i26 = 0; _i26 < _list24.size; ++_i26)
+ {
+ _elem25 = iprot.readString();
+ struct.emails.add(_elem25);
+ }
+ iprot.readListEnd();
+ }
+ struct.setEmailsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // USER_NAME
+ 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 6: // 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 7: // ORCID_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.orcidId = iprot.readString();
+ struct.setOrcidIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // PHONES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
+ struct.phones = new ArrayList<String>(_list27.size);
+ String _elem28;
+ for (int _i29 = 0; _i29 < _list27.size; ++_i29)
+ {
+ _elem28 = iprot.readString();
+ struct.phones.add(_elem28);
+ }
+ iprot.readListEnd();
+ }
+ struct.setPhonesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 9: // COUNTRY
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.country = iprot.readString();
+ struct.setCountryIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 10: // NATIONALITY
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
+ struct.nationality = new ArrayList<String>(_list30.size);
+ String _elem31;
+ for (int _i32 = 0; _i32 < _list30.size; ++_i32)
+ {
+ _elem31 = iprot.readString();
+ struct.nationality.add(_elem31);
+ }
+ iprot.readListEnd();
+ }
+ struct.setNationalityIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 11: // HOME_ORGANIZATION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.homeOrganization = iprot.readString();
+ struct.setHomeOrganizationIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 12: // ORGINATION_AFFILIATION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.orginationAffiliation = iprot.readString();
+ struct.setOrginationAffiliationIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 13: // CREATION_TIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.creationTime = iprot.readString();
+ struct.setCreationTimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 14: // LAST_ACCESS_TIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.lastAccessTime = iprot.readString();
+ struct.setLastAccessTimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 15: // VALID_UNTIL
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.validUntil = iprot.readString();
+ struct.setValidUntilIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 16: // STATE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.State = org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
+ struct.setStateIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 17: // COMMENTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.comments = iprot.readString();
+ struct.setCommentsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 18: // LABELED_URI
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list33 = iprot.readListBegin();
+ struct.labeledURI = new ArrayList<String>(_list33.size);
+ String _elem34;
+ for (int _i35 = 0; _i35 < _list33.size; ++_i35)
+ {
+ _elem34 = iprot.readString();
+ struct.labeledURI.add(_elem34);
+ }
+ iprot.readListEnd();
+ }
+ struct.setLabeledURIIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 19: // GPG_KEY
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gpgKey = iprot.readString();
+ struct.setGpgKeyIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 20: // TIME_ZONE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.timeZone = iprot.readString();
+ struct.setTimeZoneIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 21: // NSF_DEMOGRAPHICS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.nsfDemographics = new NSFDemographics();
+ struct.nsfDemographics.read(iprot);
+ struct.setNsfDemographicsIsSet(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, UserProfile struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.userModelVersion != null) {
+ oprot.writeFieldBegin(USER_MODEL_VERSION_FIELD_DESC);
+ oprot.writeString(struct.userModelVersion);
+ oprot.writeFieldEnd();
+ }
+ if (struct.airavataInternalUserId != null) {
+ oprot.writeFieldBegin(AIRAVATA_INTERNAL_USER_ID_FIELD_DESC);
+ oprot.writeString(struct.airavataInternalUserId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.userId != null) {
+ oprot.writeFieldBegin(USER_ID_FIELD_DESC);
+ oprot.writeString(struct.userId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.emails != null) {
+ oprot.writeFieldBegin(EMAILS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.emails.size()));
+ for (String _iter36 : struct.emails)
+ {
+ oprot.writeString(_iter36);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.userName != null) {
+ if (struct.isSetUserName()) {
+ oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.userName);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayId != null) {
+ if (struct.isSetGatewayId()) {
+ oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+ oprot.writeString(struct.gatewayId);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.orcidId != null) {
+ if (struct.isSetOrcidId()) {
+ oprot.writeFieldBegin(ORCID_ID_FIELD_DESC);
+ oprot.writeString(struct.orcidId);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.phones != null) {
+ if (struct.isSetPhones()) {
+ oprot.writeFieldBegin(PHONES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.phones.size()));
+ for (String _iter37 : struct.phones)
+ {
+ oprot.writeString(_iter37);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.country != null) {
+ if (struct.isSetCountry()) {
+ oprot.writeFieldBegin(COUNTRY_FIELD_DESC);
+ oprot.writeString(struct.country);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.nationality != null) {
+ if (struct.isSetNationality()) {
+ oprot.writeFieldBegin(NATIONALITY_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nationality.size()));
+ for (String _iter38 : struct.nationality)
+ {
+ oprot.writeString(_iter38);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.homeOrganization != null) {
+ if (struct.isSetHomeOrganization()) {
+ oprot.writeFieldBegin(HOME_ORGANIZATION_FIELD_DESC);
+ oprot.writeString(struct.homeOrganization);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.orginationAffiliation != null) {
+ if (struct.isSetOrginationAffiliation()) {
+ oprot.writeFieldBegin(ORGINATION_AFFILIATION_FIELD_DESC);
+ oprot.writeString(struct.orginationAffiliation);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.creationTime != null) {
+ oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC);
+ oprot.writeString(struct.creationTime);
+ oprot.writeFieldEnd();
+ }
+ if (struct.lastAccessTime != null) {
+ oprot.writeFieldBegin(LAST_ACCESS_TIME_FIELD_DESC);
+ oprot.writeString(struct.lastAccessTime);
+ oprot.writeFieldEnd();
+ }
+ if (struct.validUntil != null) {
+ oprot.writeFieldBegin(VALID_UNTIL_FIELD_DESC);
+ oprot.writeString(struct.validUntil);
+ oprot.writeFieldEnd();
+ }
+ if (struct.State != null) {
+ oprot.writeFieldBegin(STATE_FIELD_DESC);
+ oprot.writeI32(struct.State.getValue());
+ oprot.writeFieldEnd();
+ }
+ if (struct.comments != null) {
+ if (struct.isSetComments()) {
+ oprot.writeFieldBegin(COMMENTS_FIELD_DESC);
+ oprot.writeString(struct.comments);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.labeledURI != null) {
+ if (struct.isSetLabeledURI()) {
+ oprot.writeFieldBegin(LABELED_URI_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.labeledURI.size()));
+ for (String _iter39 : struct.labeledURI)
+ {
+ oprot.writeString(_iter39);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gpgKey != null) {
+ if (struct.isSetGpgKey()) {
+ oprot.writeFieldBegin(GPG_KEY_FIELD_DESC);
+ oprot.writeString(struct.gpgKey);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.timeZone != null) {
+ if (struct.isSetTimeZone()) {
+ oprot.writeFieldBegin(TIME_ZONE_FIELD_DESC);
+ oprot.writeString(struct.timeZone);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.nsfDemographics != null) {
+ if (struct.isSetNsfDemographics()) {
+ oprot.writeFieldBegin(NSF_DEMOGRAPHICS_FIELD_DESC);
+ struct.nsfDemographics.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class UserProfileTupleSchemeFactory implements SchemeFactory {
+ public UserProfileTupleScheme getScheme() {
+ return new UserProfileTupleScheme();
+ }
+ }
+
+ private static class UserProfileTupleScheme extends TupleScheme<UserProfile> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, UserProfile struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.userModelVersion);
+ oprot.writeString(struct.airavataInternalUserId);
+ oprot.writeString(struct.userId);
+ {
+ oprot.writeI32(struct.emails.size());
+ for (String _iter40 : struct.emails)
+ {
+ oprot.writeString(_iter40);
+ }
+ }
+ oprot.writeString(struct.creationTime);
+ oprot.writeString(struct.lastAccessTime);
+ oprot.writeString(struct.validUntil);
+ oprot.writeI32(struct.State.getValue());
+ BitSet optionals = new BitSet();
+ if (struct.isSetUserName()) {
+ optionals.set(0);
+ }
+ if (struct.isSetGatewayId()) {
+ optionals.set(1);
+ }
+ if (struct.isSetOrcidId()) {
+ optionals.set(2);
+ }
+ if (struct.isSetPhones()) {
+ optionals.set(3);
+ }
+ if (struct.isSetCountry()) {
+ optionals.set(4);
+ }
+ if (struct.isSetNationality()) {
+ optionals.set(5);
+ }
+
<TRUNCATED>
[09/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fad21741
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fad21741
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fad21741
Branch: refs/heads/develop
Commit: fad21741d1f7c4df2b0d7ee9c7be637a15bd4d8e
Parents: b5bdad1 26fd7c3
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Apr 22 21:57:54 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Apr 22 21:57:54 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 87 +
.../handler/AiravataServerHandlerTest.java | 22 +
.../java/org/apache/airavata/api/Airavata.java | 15220 ++++++++++++-----
.../main/resources/lib/airavata/Airavata.cpp | 5355 ++++--
.../src/main/resources/lib/airavata/Airavata.h | 1172 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 32 +
.../lib/airavata/scheduling_model_types.cpp | 66 +
.../lib/airavata/scheduling_model_types.h | 28 +-
.../lib/airavata/workspace_model_types.cpp | 201 +
.../lib/airavata/workspace_model_types.h | 81 +
.../resources/lib/Airavata/API/Airavata.php | 3062 +++-
.../lib/Airavata/Model/Scheduling/Types.php | 69 +
.../lib/Airavata/Model/Workspace/Types.php | 190 +
.../lib/apache/airavata/api/Airavata-remote | 35 +
.../lib/apache/airavata/api/Airavata.py | 2754 ++-
.../apache/airavata/model/scheduling/ttypes.py | 41 +-
.../apache/airavata/model/workspace/ttypes.py | 136 +
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 328 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 920 +
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
modules/cloud/cloud-provisioning/README | 7 +
modules/cloud/cloud-provisioning/pom.xml | 60 +
.../airavata/cloud/intf/CloudInterface.java | 78 +
.../cloud/intf/impl/OpenstackIntfImpl.java | 276 +
.../cloud/openstack/OS4JClientProvider.java | 117 +
.../apache/airavata/cloud/util/CloudRef.java | 40 +
.../apache/airavata/cloud/util/Constants.java | 36 +
.../org/apache/airavata/cloud/util/IPType.java | 39 +
.../main/resources/jetstream_openrc.properties | 33 +
.../airavata/cloud/test/CloudIntfTest.java | 131 +
.../src/test/resources/test_data.properties | 26 +
modules/cloud/pom.xml | 6 +-
.../main/resources/airavata-server.properties | 6 +-
.../test/resources/airavata-server.properties | 274 -
.../gfac/core/context/ProcessContext.java | 8 +-
.../org/apache/airavata/gfac/impl/Factory.java | 43 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 9 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 91 +-
.../org/apache/airavata/gfac/impl/SSHUtils.java | 6 +-
.../impl/task/DefaultJobSubmissionTask.java | 14 +-
.../core/utils/OrchestratorUtils.java | 34 +
.../cpi/impl/SimpleOrchestratorImpl.java | 14 +-
.../core/experiment/catalog/ResourceType.java | 1 +
.../catalog/impl/ExperimentCatalogImpl.java | 17 +
.../catalog/impl/NotificationRegistry.java | 87 +
.../core/experiment/catalog/impl/UserReg.java | 41 -
.../experiment/catalog/impl/UserRegistry.java | 41 +
.../experiment/catalog/model/Notification.java | 98 +
.../catalog/model/ProcessResourceSchedule.java | 30 +
.../catalog/model/UserConfigurationData.java | 30 +
.../resources/AbstractExpCatResource.java | 7 +
.../catalog/resources/NotificationResource.java | 267 +
.../ProcessResourceScheduleResource.java | 30 +
.../UserConfigurationDataResource.java | 60 +-
.../experiment/catalog/resources/Utils.java | 27 +
.../utils/ThriftDataModelConversion.java | 26 +
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/expcatalog-derby.sql | 14 +
.../src/main/resources/expcatalog-mysql.sql | 14 +
.../registry/cpi/ExpCatParentDataType.java | 3 +-
.../cpi/ExperimentCatalogModelType.java | 1 +
pom.xml | 2 +-
.../airavata-apis/airavata_api.thrift | 33 +
.../scheduling_model.thrift | 5 +-
.../workspace_model.thrift | 9 +
145 files changed, 24849 insertions(+), 7304 deletions(-)
----------------------------------------------------------------------
[02/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7e7e3a96
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e7e3a96
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e7e3a96
Branch: refs/heads/develop
Commit: 7e7e3a969b6421a4cc968aa266337641923865e9
Parents: cf6304c 6d32024
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Mar 23 11:00:17 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Mar 23 11:00:17 2016 -0400
----------------------------------------------------------------------
.../cpi/impl/SimpleOrchestratorImpl.java | 60 +++++++++++---------
1 file changed, 34 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[12/18] airavata git commit: adding user profile thrift generated
files
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java
new file mode 100644
index 0000000..de4077c
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/disability.java
@@ -0,0 +1,68 @@
+/**
+ * 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.user;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+public enum disability implements org.apache.thrift.TEnum {
+ HEARING_IMAPAIRED(0),
+ VISUAL_IMPAIRED(1),
+ MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT(2),
+ OTHER_IMPAIRMENT(3);
+
+ private final int value;
+
+ private disability(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static disability findByValue(int value) {
+ switch (value) {
+ case 0:
+ return HEARING_IMAPAIRED;
+ case 1:
+ return VISUAL_IMPAIRED;
+ case 2:
+ return MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT;
+ case 3:
+ return OTHER_IMPAIRMENT;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java
new file mode 100644
index 0000000..aaf005b
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/ethnicity.java
@@ -0,0 +1,67 @@
+/**
+ * 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.user;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+/**
+ * Hispanic or Latino - a person of Mexican, Puerto Rican, Cuban, South or
+ * Central American, or other Spanish culture or origin, regardless of race.
+ *
+ */
+public enum ethnicity implements org.apache.thrift.TEnum {
+ HISPANIC_LATINO(0),
+ NOT_HISPANIC_LATINO(1);
+
+ private final int value;
+
+ private ethnicity(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static ethnicity findByValue(int value) {
+ switch (value) {
+ case 0:
+ return HISPANIC_LATINO;
+ case 1:
+ return NOT_HISPANIC_LATINO;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java
new file mode 100644
index 0000000..dbf1cac
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/race.java
@@ -0,0 +1,86 @@
+/**
+ * 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.user;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+/**
+ * * Asian - a person having origins in any of the original peoples of the Far East,
+ * * Southeast Asia, or the Indian subcontinent including, for example, Cambodia,
+ * * China, India, Japan, Korea, Malaysia, Pakistan, the Philippine Islands,
+ * * Thailand, and Vietnam.
+ * * American Indian or Alaskan Native - a person having origins in any of the original
+ * * peoples of North and South America (including Central America), and who maintains
+ * * tribal affiliation or community attachment.
+ * * Black or African American - a person having origins in any of the black racial groups
+ * * of Africa.
+ * * Native Hawaiian or Pacific Islander - a person having origins in any of the original
+ * * peoples of Hawaii, Guan, Samoa, or other Pacific Islands.
+ * * White - a person having origins in any of the original peoples of Europe, the Middle East, or North Africa.
+ * *
+ */
+public enum race implements org.apache.thrift.TEnum {
+ ASIAN(0),
+ AMERICAN_INDIAN_OR_ALASKAN_NATIVE(1),
+ BLACK_OR_AFRICAN_AMERICAN(2),
+ NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER(3),
+ WHITE(4);
+
+ private final int value;
+
+ private race(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static race findByValue(int value) {
+ switch (value) {
+ case 0:
+ return ASIAN;
+ case 1:
+ return AMERICAN_INDIAN_OR_ALASKAN_NATIVE;
+ case 2:
+ return BLACK_OR_AFRICAN_AMERICAN;
+ case 3:
+ return NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER;
+ case 4:
+ return WHITE;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java
new file mode 100644
index 0000000..37b47a8
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/user_profile_modelConstants.java
@@ -0,0 +1,58 @@
+/**
+ * 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.user;
+
+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"})
+public class user_profile_modelConstants {
+
+ public static final String USER_PROFILE_VERSION = "1.0";
+
+}
[05/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3dce244c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3dce244c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3dce244c
Branch: refs/heads/develop
Commit: 3dce244cb5995cb191f5d9d580a1fbaca1acd6af
Parents: eeb1016 e8b7773
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 28 11:23:58 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 28 11:23:58 2016 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/task/BESJobSubmissionTask.java | 5 ++---
.../main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[11/18] airavata git commit: making a trivial commit to trigger travis
Posted by sc...@apache.org.
making a trivial commit to trigger travis
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0f962e73
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0f962e73
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0f962e73
Branch: refs/heads/develop
Commit: 0f962e737bf763f73f8a8674b8d981b25e6688ab
Parents: 4845de4
Author: Suresh Marru <sm...@apache.org>
Authored: Mon May 16 15:47:01 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon May 16 15:47:01 2016 -0400
----------------------------------------------------------------------
README | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0f962e73/README
----------------------------------------------------------------------
diff --git a/README b/README
index dd051b6..90b8270 100644
--- a/README
+++ b/README
@@ -62,7 +62,6 @@ Airavata Source Distribution Directory Structure
\u2502 \u2502 \u251c\u2500\u2500 orchestrator-server
\u2502 \u2502 \u251c\u2500\u2500 server
\u2502 \u2502 \u2514\u2500\u2500 release
- \u2502 \u2502 \u2514\u2500\u2500 xbaya-gui
\u2502 \u251c\u2500\u2500 gfac
\u2502 \u2502 \u251c\u2500\u2500 airavata-gfac-service
\u2502 \u2502 \u251c\u2500\u2500 gfac-bes
[14/18] airavata git commit: adding user profile thrift generated
files
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
new file mode 100644
index 0000000..9c3468c
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
@@ -0,0 +1,738 @@
+#
+# Autogenerated by Thrift Compiler (0.9.3)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+# options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+import apache.airavata.model.commons.ttypes
+
+
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol, TProtocol
+try:
+ from thrift.protocol import fastbinary
+except:
+ fastbinary = None
+
+
+class Status:
+ ACTIVE = 0
+ CONFIRMED = 1
+ APPROVED = 2
+ DELETED = 3
+ DUPLICATE = 4
+ GRACE_PERIOD = 5
+ INVITED = 6
+ DENIED = 7
+ PENDING = 8
+ PENDING_APPROVAL = 9
+ PENDING_CONFIRMATION = 10
+ SUSPENDED = 11
+ DECLINED = 12
+ EXPIRED = 13
+
+ _VALUES_TO_NAMES = {
+ 0: "ACTIVE",
+ 1: "CONFIRMED",
+ 2: "APPROVED",
+ 3: "DELETED",
+ 4: "DUPLICATE",
+ 5: "GRACE_PERIOD",
+ 6: "INVITED",
+ 7: "DENIED",
+ 8: "PENDING",
+ 9: "PENDING_APPROVAL",
+ 10: "PENDING_CONFIRMATION",
+ 11: "SUSPENDED",
+ 12: "DECLINED",
+ 13: "EXPIRED",
+ }
+
+ _NAMES_TO_VALUES = {
+ "ACTIVE": 0,
+ "CONFIRMED": 1,
+ "APPROVED": 2,
+ "DELETED": 3,
+ "DUPLICATE": 4,
+ "GRACE_PERIOD": 5,
+ "INVITED": 6,
+ "DENIED": 7,
+ "PENDING": 8,
+ "PENDING_APPROVAL": 9,
+ "PENDING_CONFIRMATION": 10,
+ "SUSPENDED": 11,
+ "DECLINED": 12,
+ "EXPIRED": 13,
+ }
+
+class USCitizenship:
+ """
+ U.S. Citizen (see: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+
+ """
+ US_CITIZEN = 0
+ US_PERMANENT_RESIDENT = 1
+ OTHER_NON_US_CITIZEN = 2
+
+ _VALUES_TO_NAMES = {
+ 0: "US_CITIZEN",
+ 1: "US_PERMANENT_RESIDENT",
+ 2: "OTHER_NON_US_CITIZEN",
+ }
+
+ _NAMES_TO_VALUES = {
+ "US_CITIZEN": 0,
+ "US_PERMANENT_RESIDENT": 1,
+ "OTHER_NON_US_CITIZEN": 2,
+ }
+
+class ethnicity:
+ """
+ Hispanic or Latino - a person of Mexican, Puerto Rican, Cuban, South or
+ Central American, or other Spanish culture or origin, regardless of race.
+
+ """
+ HISPANIC_LATINO = 0
+ NOT_HISPANIC_LATINO = 1
+
+ _VALUES_TO_NAMES = {
+ 0: "HISPANIC_LATINO",
+ 1: "NOT_HISPANIC_LATINO",
+ }
+
+ _NAMES_TO_VALUES = {
+ "HISPANIC_LATINO": 0,
+ "NOT_HISPANIC_LATINO": 1,
+ }
+
+class race:
+ """
+ * Asian - a person having origins in any of the original peoples of the Far East,
+ * Southeast Asia, or the Indian subcontinent including, for example, Cambodia,
+ * China, India, Japan, Korea, Malaysia, Pakistan, the Philippine Islands,
+ * Thailand, and Vietnam.
+ * American Indian or Alaskan Native - a person having origins in any of the original
+ * peoples of North and South America (including Central America), and who maintains
+ * tribal affiliation or community attachment.
+ * Black or African American - a person having origins in any of the black racial groups
+ * of Africa.
+ * Native Hawaiian or Pacific Islander - a person having origins in any of the original
+ * peoples of Hawaii, Guan, Samoa, or other Pacific Islands.
+ * White - a person having origins in any of the original peoples of Europe, the Middle East, or North Africa.
+ *
+ """
+ ASIAN = 0
+ AMERICAN_INDIAN_OR_ALASKAN_NATIVE = 1
+ BLACK_OR_AFRICAN_AMERICAN = 2
+ NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER = 3
+ WHITE = 4
+
+ _VALUES_TO_NAMES = {
+ 0: "ASIAN",
+ 1: "AMERICAN_INDIAN_OR_ALASKAN_NATIVE",
+ 2: "BLACK_OR_AFRICAN_AMERICAN",
+ 3: "NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER",
+ 4: "WHITE",
+ }
+
+ _NAMES_TO_VALUES = {
+ "ASIAN": 0,
+ "AMERICAN_INDIAN_OR_ALASKAN_NATIVE": 1,
+ "BLACK_OR_AFRICAN_AMERICAN": 2,
+ "NATIVE_HAWAIIAN_OR_PACIFIC_ISLANDER": 3,
+ "WHITE": 4,
+ }
+
+class disability:
+ HEARING_IMAPAIRED = 0
+ VISUAL_IMPAIRED = 1
+ MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT = 2
+ OTHER_IMPAIRMENT = 3
+
+ _VALUES_TO_NAMES = {
+ 0: "HEARING_IMAPAIRED",
+ 1: "VISUAL_IMPAIRED",
+ 2: "MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT",
+ 3: "OTHER_IMPAIRMENT",
+ }
+
+ _NAMES_TO_VALUES = {
+ "HEARING_IMAPAIRED": 0,
+ "VISUAL_IMPAIRED": 1,
+ "MOBILITY_OR_ORTHOPEDIC_IMPAIRMENT": 2,
+ "OTHER_IMPAIRMENT": 3,
+ }
+
+
+class NSFDemographics:
+ """
+ A structure holding the NSF Demographic information.
+
+
+
+ Attributes:
+ - gender
+ - usCitizenship
+ - ethnicities
+ - races
+ - disabilities
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'gender', None, None, ), # 1
+ (2, TType.I32, 'usCitizenship', None, None, ), # 2
+ (3, TType.LIST, 'ethnicities', (TType.I32,None), None, ), # 3
+ (4, TType.LIST, 'races', (TType.I32,None), None, ), # 4
+ (5, TType.LIST, 'disabilities', (TType.I32,None), None, ), # 5
+ )
+
+ def __init__(self, gender=None, usCitizenship=None, ethnicities=None, races=None, disabilities=None,):
+ self.gender = gender
+ self.usCitizenship = usCitizenship
+ self.ethnicities = ethnicities
+ self.races = races
+ self.disabilities = disabilities
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.gender = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.I32:
+ self.usCitizenship = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.LIST:
+ self.ethnicities = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in xrange(_size0):
+ _elem5 = iprot.readI32()
+ self.ethnicities.append(_elem5)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.LIST:
+ self.races = []
+ (_etype9, _size6) = iprot.readListBegin()
+ for _i10 in xrange(_size6):
+ _elem11 = iprot.readI32()
+ self.races.append(_elem11)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.LIST:
+ self.disabilities = []
+ (_etype15, _size12) = iprot.readListBegin()
+ for _i16 in xrange(_size12):
+ _elem17 = iprot.readI32()
+ self.disabilities.append(_elem17)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('NSFDemographics')
+ if self.gender is not None:
+ oprot.writeFieldBegin('gender', TType.STRING, 1)
+ oprot.writeString(self.gender)
+ oprot.writeFieldEnd()
+ if self.usCitizenship is not None:
+ oprot.writeFieldBegin('usCitizenship', TType.I32, 2)
+ oprot.writeI32(self.usCitizenship)
+ oprot.writeFieldEnd()
+ if self.ethnicities is not None:
+ oprot.writeFieldBegin('ethnicities', TType.LIST, 3)
+ oprot.writeListBegin(TType.I32, len(self.ethnicities))
+ for iter18 in self.ethnicities:
+ oprot.writeI32(iter18)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.races is not None:
+ oprot.writeFieldBegin('races', TType.LIST, 4)
+ oprot.writeListBegin(TType.I32, len(self.races))
+ for iter19 in self.races:
+ oprot.writeI32(iter19)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.disabilities is not None:
+ oprot.writeFieldBegin('disabilities', TType.LIST, 5)
+ oprot.writeListBegin(TType.I32, len(self.disabilities))
+ for iter20 in self.disabilities:
+ oprot.writeI32(iter20)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.gender)
+ value = (value * 31) ^ hash(self.usCitizenship)
+ value = (value * 31) ^ hash(self.ethnicities)
+ value = (value * 31) ^ hash(self.races)
+ value = (value * 31) ^ hash(self.disabilities)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class UserProfile:
+ """
+ * A structure holding the user profile and its child models.
+ *
+ * Notes:
+ * The model does not include passwords as it is assumed an external identity provider is used to authenticate user.
+ * References:
+ * NSF Demographic Information - http://www.nsf.gov/pubs/2000/00form1225/00form1225.doc
+ * LDAP Schema - https://tools.ietf.org/html/rfc4519
+ * SCIM 2.0 - https://tools.ietf.org/html/rfc7643
+ *
+ * userModelVersion:
+ * Version number of profile
+ *
+ * airavataInternalUserId:
+ * internal to Airavata, not intended to be used outside of the Airavata platform or possibly by gateways
+ * (that is, never shown to users), never reassigned, REQUIRED
+ *
+ * userId:
+ * Externally assertable unique identifier. SAML (primarly in higher education, academic) tends to keep
+ * user name less opaque. OpenID Connect maintains them to be opaque.
+ *
+ * emails:
+ * Email identifier are Verified, REQUIRED and MULTIVALUED
+ *
+ * userName:
+ * Name-based identifiers can be multivalues. To keep it simple, Airavata will make it a string.
+ * In the future these can be enumerated as:
+ * Official name (as asserted possibly by some external identity provider)
+ * Prefered name (as asserted or suggested by user directly)
+ * Components:
+ * givenName
+ * surname (familyName)
+ * displayName (often asserted by user to handle things like middle names, suffix, prefix, and the like)
+ *
+ * orcidId: ORCID ID - http://orcid.org/about/what-is-orcid)
+ *
+ * phones: Telephone MULTIVALUED
+ *
+ * country: Country of Residance
+ *
+ * nationality Countries of citizenship
+ *
+ * comments:
+ * Free-form information (treated as opaque by Airavata and simply passed to resource).
+ *
+ * labeledURI:
+ * Google Scholar, Web of Science, ACS, e.t.c
+ *
+ * timeZone:
+ * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
+ *
+
+ Attributes:
+ - userModelVersion
+ - airavataInternalUserId
+ - userId
+ - emails
+ - userName
+ - gatewayId
+ - orcidId
+ - phones
+ - country
+ - nationality
+ - homeOrganization
+ - orginationAffiliation
+ - creationTime
+ - lastAccessTime
+ - validUntil
+ - State
+ - comments
+ - labeledURI
+ - gpgKey
+ - timeZone
+ - nsfDemographics
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'userModelVersion', None, "1.0", ), # 1
+ (2, TType.STRING, 'airavataInternalUserId', None, "DO_NOT_SET_AT_CLIENTS", ), # 2
+ (3, TType.STRING, 'userId', None, None, ), # 3
+ (4, TType.LIST, 'emails', (TType.STRING,None), None, ), # 4
+ (5, TType.STRING, 'userName', None, None, ), # 5
+ (6, TType.STRING, 'gatewayId', None, None, ), # 6
+ (7, TType.STRING, 'orcidId', None, None, ), # 7
+ (8, TType.LIST, 'phones', (TType.STRING,None), None, ), # 8
+ (9, TType.STRING, 'country', None, None, ), # 9
+ (10, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 10
+ (11, TType.STRING, 'homeOrganization', None, None, ), # 11
+ (12, TType.STRING, 'orginationAffiliation', None, None, ), # 12
+ (13, TType.STRING, 'creationTime', None, None, ), # 13
+ (14, TType.STRING, 'lastAccessTime', None, None, ), # 14
+ (15, TType.STRING, 'validUntil', None, None, ), # 15
+ (16, TType.I32, 'State', None, None, ), # 16
+ (17, TType.STRING, 'comments', None, None, ), # 17
+ (18, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 18
+ (19, TType.STRING, 'gpgKey', None, None, ), # 19
+ (20, TType.STRING, 'timeZone', None, None, ), # 20
+ (21, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 21
+ )
+
+ def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, emails=None, userName=None, gatewayId=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
+ self.userModelVersion = userModelVersion
+ self.airavataInternalUserId = airavataInternalUserId
+ self.userId = userId
+ self.emails = emails
+ self.userName = userName
+ self.gatewayId = gatewayId
+ self.orcidId = orcidId
+ self.phones = phones
+ self.country = country
+ self.nationality = nationality
+ self.homeOrganization = homeOrganization
+ self.orginationAffiliation = orginationAffiliation
+ self.creationTime = creationTime
+ self.lastAccessTime = lastAccessTime
+ self.validUntil = validUntil
+ self.State = State
+ self.comments = comments
+ self.labeledURI = labeledURI
+ self.gpgKey = gpgKey
+ self.timeZone = timeZone
+ self.nsfDemographics = nsfDemographics
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.userModelVersion = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.airavataInternalUserId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRING:
+ self.userId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.LIST:
+ self.emails = []
+ (_etype24, _size21) = iprot.readListBegin()
+ for _i25 in xrange(_size21):
+ _elem26 = iprot.readString()
+ self.emails.append(_elem26)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRING:
+ self.userName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.STRING:
+ self.orcidId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.LIST:
+ self.phones = []
+ (_etype30, _size27) = iprot.readListBegin()
+ for _i31 in xrange(_size27):
+ _elem32 = iprot.readString()
+ self.phones.append(_elem32)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
+ if ftype == TType.STRING:
+ self.country = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.LIST:
+ self.nationality = []
+ (_etype36, _size33) = iprot.readListBegin()
+ for _i37 in xrange(_size33):
+ _elem38 = iprot.readString()
+ self.nationality.append(_elem38)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 11:
+ if ftype == TType.STRING:
+ self.homeOrganization = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 12:
+ if ftype == TType.STRING:
+ self.orginationAffiliation = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 13:
+ if ftype == TType.STRING:
+ self.creationTime = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 14:
+ if ftype == TType.STRING:
+ self.lastAccessTime = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 15:
+ if ftype == TType.STRING:
+ self.validUntil = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 16:
+ if ftype == TType.I32:
+ self.State = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
+ if ftype == TType.STRING:
+ self.comments = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 18:
+ if ftype == TType.LIST:
+ self.labeledURI = []
+ (_etype42, _size39) = iprot.readListBegin()
+ for _i43 in xrange(_size39):
+ _elem44 = iprot.readString()
+ self.labeledURI.append(_elem44)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 19:
+ if ftype == TType.STRING:
+ self.gpgKey = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 20:
+ if ftype == TType.STRING:
+ self.timeZone = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 21:
+ if ftype == TType.STRUCT:
+ self.nsfDemographics = NSFDemographics()
+ self.nsfDemographics.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('UserProfile')
+ if self.userModelVersion is not None:
+ oprot.writeFieldBegin('userModelVersion', TType.STRING, 1)
+ oprot.writeString(self.userModelVersion)
+ oprot.writeFieldEnd()
+ if self.airavataInternalUserId is not None:
+ oprot.writeFieldBegin('airavataInternalUserId', TType.STRING, 2)
+ oprot.writeString(self.airavataInternalUserId)
+ oprot.writeFieldEnd()
+ if self.userId is not None:
+ oprot.writeFieldBegin('userId', TType.STRING, 3)
+ oprot.writeString(self.userId)
+ oprot.writeFieldEnd()
+ if self.emails is not None:
+ oprot.writeFieldBegin('emails', TType.LIST, 4)
+ oprot.writeListBegin(TType.STRING, len(self.emails))
+ for iter45 in self.emails:
+ oprot.writeString(iter45)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.userName is not None:
+ oprot.writeFieldBegin('userName', TType.STRING, 5)
+ oprot.writeString(self.userName)
+ oprot.writeFieldEnd()
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 6)
+ oprot.writeString(self.gatewayId)
+ oprot.writeFieldEnd()
+ if self.orcidId is not None:
+ oprot.writeFieldBegin('orcidId', TType.STRING, 7)
+ oprot.writeString(self.orcidId)
+ oprot.writeFieldEnd()
+ if self.phones is not None:
+ oprot.writeFieldBegin('phones', TType.LIST, 8)
+ oprot.writeListBegin(TType.STRING, len(self.phones))
+ for iter46 in self.phones:
+ oprot.writeString(iter46)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.country is not None:
+ oprot.writeFieldBegin('country', TType.STRING, 9)
+ oprot.writeString(self.country)
+ oprot.writeFieldEnd()
+ if self.nationality is not None:
+ oprot.writeFieldBegin('nationality', TType.LIST, 10)
+ oprot.writeListBegin(TType.STRING, len(self.nationality))
+ for iter47 in self.nationality:
+ oprot.writeString(iter47)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.homeOrganization is not None:
+ oprot.writeFieldBegin('homeOrganization', TType.STRING, 11)
+ oprot.writeString(self.homeOrganization)
+ oprot.writeFieldEnd()
+ if self.orginationAffiliation is not None:
+ oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 12)
+ oprot.writeString(self.orginationAffiliation)
+ oprot.writeFieldEnd()
+ if self.creationTime is not None:
+ oprot.writeFieldBegin('creationTime', TType.STRING, 13)
+ oprot.writeString(self.creationTime)
+ oprot.writeFieldEnd()
+ if self.lastAccessTime is not None:
+ oprot.writeFieldBegin('lastAccessTime', TType.STRING, 14)
+ oprot.writeString(self.lastAccessTime)
+ oprot.writeFieldEnd()
+ if self.validUntil is not None:
+ oprot.writeFieldBegin('validUntil', TType.STRING, 15)
+ oprot.writeString(self.validUntil)
+ oprot.writeFieldEnd()
+ if self.State is not None:
+ oprot.writeFieldBegin('State', TType.I32, 16)
+ oprot.writeI32(self.State)
+ oprot.writeFieldEnd()
+ if self.comments is not None:
+ oprot.writeFieldBegin('comments', TType.STRING, 17)
+ oprot.writeString(self.comments)
+ oprot.writeFieldEnd()
+ if self.labeledURI is not None:
+ oprot.writeFieldBegin('labeledURI', TType.LIST, 18)
+ oprot.writeListBegin(TType.STRING, len(self.labeledURI))
+ for iter48 in self.labeledURI:
+ oprot.writeString(iter48)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.gpgKey is not None:
+ oprot.writeFieldBegin('gpgKey', TType.STRING, 19)
+ oprot.writeString(self.gpgKey)
+ oprot.writeFieldEnd()
+ if self.timeZone is not None:
+ oprot.writeFieldBegin('timeZone', TType.STRING, 20)
+ oprot.writeString(self.timeZone)
+ oprot.writeFieldEnd()
+ if self.nsfDemographics is not None:
+ oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 21)
+ self.nsfDemographics.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.userModelVersion is None:
+ raise TProtocol.TProtocolException(message='Required field userModelVersion is unset!')
+ if self.airavataInternalUserId is None:
+ raise TProtocol.TProtocolException(message='Required field airavataInternalUserId is unset!')
+ if self.userId is None:
+ raise TProtocol.TProtocolException(message='Required field userId is unset!')
+ if self.emails is None:
+ raise TProtocol.TProtocolException(message='Required field emails is unset!')
+ if self.creationTime is None:
+ raise TProtocol.TProtocolException(message='Required field creationTime is unset!')
+ if self.lastAccessTime is None:
+ raise TProtocol.TProtocolException(message='Required field lastAccessTime is unset!')
+ if self.validUntil is None:
+ raise TProtocol.TProtocolException(message='Required field validUntil is unset!')
+ if self.State is None:
+ raise TProtocol.TProtocolException(message='Required field State is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.userModelVersion)
+ value = (value * 31) ^ hash(self.airavataInternalUserId)
+ value = (value * 31) ^ hash(self.userId)
+ value = (value * 31) ^ hash(self.emails)
+ value = (value * 31) ^ hash(self.userName)
+ value = (value * 31) ^ hash(self.gatewayId)
+ value = (value * 31) ^ hash(self.orcidId)
+ value = (value * 31) ^ hash(self.phones)
+ value = (value * 31) ^ hash(self.country)
+ value = (value * 31) ^ hash(self.nationality)
+ value = (value * 31) ^ hash(self.homeOrganization)
+ value = (value * 31) ^ hash(self.orginationAffiliation)
+ value = (value * 31) ^ hash(self.creationTime)
+ value = (value * 31) ^ hash(self.lastAccessTime)
+ value = (value * 31) ^ hash(self.validUntil)
+ value = (value * 31) ^ hash(self.State)
+ value = (value * 31) ^ hash(self.comments)
+ value = (value * 31) ^ hash(self.labeledURI)
+ value = (value * 31) ^ hash(self.gpgKey)
+ value = (value * 31) ^ hash(self.timeZone)
+ value = (value * 31) ^ hash(self.nsfDemographics)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
new file mode 100644
index 0000000..783f34b
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -0,0 +1,1007 @@
+/**
+ * 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.user;
+
+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"})
+/**
+ * A structure holding the NSF Demographic information.
+ *
+ *
+ */
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-13")
+public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
+
+ private static final org.apache.thrift.protocol.TField GENDER_FIELD_DESC = new org.apache.thrift.protocol.TField("gender", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField US_CITIZENSHIP_FIELD_DESC = new org.apache.thrift.protocol.TField("usCitizenship", org.apache.thrift.protocol.TType.I32, (short)2);
+ private static final org.apache.thrift.protocol.TField ETHNICITIES_FIELD_DESC = new org.apache.thrift.protocol.TField("ethnicities", org.apache.thrift.protocol.TType.LIST, (short)3);
+ private static final org.apache.thrift.protocol.TField RACES_FIELD_DESC = new org.apache.thrift.protocol.TField("races", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField DISABILITIES_FIELD_DESC = new org.apache.thrift.protocol.TField("disabilities", org.apache.thrift.protocol.TType.LIST, (short)5);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new NSFDemographicsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new NSFDemographicsTupleSchemeFactory());
+ }
+
+ private String gender; // optional
+ private USCitizenship usCitizenship; // optional
+ private List<ethnicity> ethnicities; // optional
+ private List<race> races; // optional
+ private List<disability> disabilities; // 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 {
+ GENDER((short)1, "gender"),
+ /**
+ *
+ * @see USCitizenship
+ */
+ US_CITIZENSHIP((short)2, "usCitizenship"),
+ ETHNICITIES((short)3, "ethnicities"),
+ RACES((short)4, "races"),
+ DISABILITIES((short)5, "disabilities");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // GENDER
+ return GENDER;
+ case 2: // US_CITIZENSHIP
+ return US_CITIZENSHIP;
+ case 3: // ETHNICITIES
+ return ETHNICITIES;
+ case 4: // RACES
+ return RACES;
+ case 5: // DISABILITIES
+ return DISABILITIES;
+ 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 _Fields optionals[] = {_Fields.GENDER,_Fields.US_CITIZENSHIP,_Fields.ETHNICITIES,_Fields.RACES,_Fields.DISABILITIES};
+ 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.GENDER, new org.apache.thrift.meta_data.FieldMetaData("gender", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.US_CITIZENSHIP, new org.apache.thrift.meta_data.FieldMetaData("usCitizenship", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, USCitizenship.class)));
+ tmpMap.put(_Fields.ETHNICITIES, new org.apache.thrift.meta_data.FieldMetaData("ethnicities", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ethnicity.class))));
+ tmpMap.put(_Fields.RACES, new org.apache.thrift.meta_data.FieldMetaData("races", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, race.class))));
+ tmpMap.put(_Fields.DISABILITIES, new org.apache.thrift.meta_data.FieldMetaData("disabilities", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, disability.class))));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NSFDemographics.class, metaDataMap);
+ }
+
+ public NSFDemographics() {
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public NSFDemographics(NSFDemographics other) {
+ if (other.isSetGender()) {
+ this.gender = other.gender;
+ }
+ if (other.isSetUsCitizenship()) {
+ this.usCitizenship = other.usCitizenship;
+ }
+ if (other.isSetEthnicities()) {
+ List<ethnicity> __this__ethnicities = new ArrayList<ethnicity>(other.ethnicities.size());
+ for (ethnicity other_element : other.ethnicities) {
+ __this__ethnicities.add(other_element);
+ }
+ this.ethnicities = __this__ethnicities;
+ }
+ if (other.isSetRaces()) {
+ List<race> __this__races = new ArrayList<race>(other.races.size());
+ for (race other_element : other.races) {
+ __this__races.add(other_element);
+ }
+ this.races = __this__races;
+ }
+ if (other.isSetDisabilities()) {
+ List<disability> __this__disabilities = new ArrayList<disability>(other.disabilities.size());
+ for (disability other_element : other.disabilities) {
+ __this__disabilities.add(other_element);
+ }
+ this.disabilities = __this__disabilities;
+ }
+ }
+
+ public NSFDemographics deepCopy() {
+ return new NSFDemographics(this);
+ }
+
+ @Override
+ public void clear() {
+ this.gender = null;
+ this.usCitizenship = null;
+ this.ethnicities = null;
+ this.races = null;
+ this.disabilities = null;
+ }
+
+ public String getGender() {
+ return this.gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+
+ public void unsetGender() {
+ this.gender = null;
+ }
+
+ /** Returns true if field gender is set (has been assigned a value) and false otherwise */
+ public boolean isSetGender() {
+ return this.gender != null;
+ }
+
+ public void setGenderIsSet(boolean value) {
+ if (!value) {
+ this.gender = null;
+ }
+ }
+
+ /**
+ *
+ * @see USCitizenship
+ */
+ public USCitizenship getUsCitizenship() {
+ return this.usCitizenship;
+ }
+
+ /**
+ *
+ * @see USCitizenship
+ */
+ public void setUsCitizenship(USCitizenship usCitizenship) {
+ this.usCitizenship = usCitizenship;
+ }
+
+ public void unsetUsCitizenship() {
+ this.usCitizenship = null;
+ }
+
+ /** Returns true if field usCitizenship is set (has been assigned a value) and false otherwise */
+ public boolean isSetUsCitizenship() {
+ return this.usCitizenship != null;
+ }
+
+ public void setUsCitizenshipIsSet(boolean value) {
+ if (!value) {
+ this.usCitizenship = null;
+ }
+ }
+
+ public int getEthnicitiesSize() {
+ return (this.ethnicities == null) ? 0 : this.ethnicities.size();
+ }
+
+ public java.util.Iterator<ethnicity> getEthnicitiesIterator() {
+ return (this.ethnicities == null) ? null : this.ethnicities.iterator();
+ }
+
+ public void addToEthnicities(ethnicity elem) {
+ if (this.ethnicities == null) {
+ this.ethnicities = new ArrayList<ethnicity>();
+ }
+ this.ethnicities.add(elem);
+ }
+
+ public List<ethnicity> getEthnicities() {
+ return this.ethnicities;
+ }
+
+ public void setEthnicities(List<ethnicity> ethnicities) {
+ this.ethnicities = ethnicities;
+ }
+
+ public void unsetEthnicities() {
+ this.ethnicities = null;
+ }
+
+ /** Returns true if field ethnicities is set (has been assigned a value) and false otherwise */
+ public boolean isSetEthnicities() {
+ return this.ethnicities != null;
+ }
+
+ public void setEthnicitiesIsSet(boolean value) {
+ if (!value) {
+ this.ethnicities = null;
+ }
+ }
+
+ public int getRacesSize() {
+ return (this.races == null) ? 0 : this.races.size();
+ }
+
+ public java.util.Iterator<race> getRacesIterator() {
+ return (this.races == null) ? null : this.races.iterator();
+ }
+
+ public void addToRaces(race elem) {
+ if (this.races == null) {
+ this.races = new ArrayList<race>();
+ }
+ this.races.add(elem);
+ }
+
+ public List<race> getRaces() {
+ return this.races;
+ }
+
+ public void setRaces(List<race> races) {
+ this.races = races;
+ }
+
+ public void unsetRaces() {
+ this.races = null;
+ }
+
+ /** Returns true if field races is set (has been assigned a value) and false otherwise */
+ public boolean isSetRaces() {
+ return this.races != null;
+ }
+
+ public void setRacesIsSet(boolean value) {
+ if (!value) {
+ this.races = null;
+ }
+ }
+
+ public int getDisabilitiesSize() {
+ return (this.disabilities == null) ? 0 : this.disabilities.size();
+ }
+
+ public java.util.Iterator<disability> getDisabilitiesIterator() {
+ return (this.disabilities == null) ? null : this.disabilities.iterator();
+ }
+
+ public void addToDisabilities(disability elem) {
+ if (this.disabilities == null) {
+ this.disabilities = new ArrayList<disability>();
+ }
+ this.disabilities.add(elem);
+ }
+
+ public List<disability> getDisabilities() {
+ return this.disabilities;
+ }
+
+ public void setDisabilities(List<disability> disabilities) {
+ this.disabilities = disabilities;
+ }
+
+ public void unsetDisabilities() {
+ this.disabilities = null;
+ }
+
+ /** Returns true if field disabilities is set (has been assigned a value) and false otherwise */
+ public boolean isSetDisabilities() {
+ return this.disabilities != null;
+ }
+
+ public void setDisabilitiesIsSet(boolean value) {
+ if (!value) {
+ this.disabilities = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case GENDER:
+ if (value == null) {
+ unsetGender();
+ } else {
+ setGender((String)value);
+ }
+ break;
+
+ case US_CITIZENSHIP:
+ if (value == null) {
+ unsetUsCitizenship();
+ } else {
+ setUsCitizenship((USCitizenship)value);
+ }
+ break;
+
+ case ETHNICITIES:
+ if (value == null) {
+ unsetEthnicities();
+ } else {
+ setEthnicities((List<ethnicity>)value);
+ }
+ break;
+
+ case RACES:
+ if (value == null) {
+ unsetRaces();
+ } else {
+ setRaces((List<race>)value);
+ }
+ break;
+
+ case DISABILITIES:
+ if (value == null) {
+ unsetDisabilities();
+ } else {
+ setDisabilities((List<disability>)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case GENDER:
+ return getGender();
+
+ case US_CITIZENSHIP:
+ return getUsCitizenship();
+
+ case ETHNICITIES:
+ return getEthnicities();
+
+ case RACES:
+ return getRaces();
+
+ case DISABILITIES:
+ return getDisabilities();
+
+ }
+ 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 GENDER:
+ return isSetGender();
+ case US_CITIZENSHIP:
+ return isSetUsCitizenship();
+ case ETHNICITIES:
+ return isSetEthnicities();
+ case RACES:
+ return isSetRaces();
+ case DISABILITIES:
+ return isSetDisabilities();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof NSFDemographics)
+ return this.equals((NSFDemographics)that);
+ return false;
+ }
+
+ public boolean equals(NSFDemographics that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_gender = true && this.isSetGender();
+ boolean that_present_gender = true && that.isSetGender();
+ if (this_present_gender || that_present_gender) {
+ if (!(this_present_gender && that_present_gender))
+ return false;
+ if (!this.gender.equals(that.gender))
+ return false;
+ }
+
+ boolean this_present_usCitizenship = true && this.isSetUsCitizenship();
+ boolean that_present_usCitizenship = true && that.isSetUsCitizenship();
+ if (this_present_usCitizenship || that_present_usCitizenship) {
+ if (!(this_present_usCitizenship && that_present_usCitizenship))
+ return false;
+ if (!this.usCitizenship.equals(that.usCitizenship))
+ return false;
+ }
+
+ boolean this_present_ethnicities = true && this.isSetEthnicities();
+ boolean that_present_ethnicities = true && that.isSetEthnicities();
+ if (this_present_ethnicities || that_present_ethnicities) {
+ if (!(this_present_ethnicities && that_present_ethnicities))
+ return false;
+ if (!this.ethnicities.equals(that.ethnicities))
+ return false;
+ }
+
+ boolean this_present_races = true && this.isSetRaces();
+ boolean that_present_races = true && that.isSetRaces();
+ if (this_present_races || that_present_races) {
+ if (!(this_present_races && that_present_races))
+ return false;
+ if (!this.races.equals(that.races))
+ return false;
+ }
+
+ boolean this_present_disabilities = true && this.isSetDisabilities();
+ boolean that_present_disabilities = true && that.isSetDisabilities();
+ if (this_present_disabilities || that_present_disabilities) {
+ if (!(this_present_disabilities && that_present_disabilities))
+ return false;
+ if (!this.disabilities.equals(that.disabilities))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_gender = true && (isSetGender());
+ list.add(present_gender);
+ if (present_gender)
+ list.add(gender);
+
+ boolean present_usCitizenship = true && (isSetUsCitizenship());
+ list.add(present_usCitizenship);
+ if (present_usCitizenship)
+ list.add(usCitizenship.getValue());
+
+ boolean present_ethnicities = true && (isSetEthnicities());
+ list.add(present_ethnicities);
+ if (present_ethnicities)
+ list.add(ethnicities);
+
+ boolean present_races = true && (isSetRaces());
+ list.add(present_races);
+ if (present_races)
+ list.add(races);
+
+ boolean present_disabilities = true && (isSetDisabilities());
+ list.add(present_disabilities);
+ if (present_disabilities)
+ list.add(disabilities);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(NSFDemographics other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetGender()).compareTo(other.isSetGender());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGender()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gender, other.gender);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetUsCitizenship()).compareTo(other.isSetUsCitizenship());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUsCitizenship()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usCitizenship, other.usCitizenship);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetEthnicities()).compareTo(other.isSetEthnicities());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetEthnicities()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ethnicities, other.ethnicities);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetRaces()).compareTo(other.isSetRaces());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRaces()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.races, other.races);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetDisabilities()).compareTo(other.isSetDisabilities());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDisabilities()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.disabilities, other.disabilities);
+ 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("NSFDemographics(");
+ boolean first = true;
+
+ if (isSetGender()) {
+ sb.append("gender:");
+ if (this.gender == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gender);
+ }
+ first = false;
+ }
+ if (isSetUsCitizenship()) {
+ if (!first) sb.append(", ");
+ sb.append("usCitizenship:");
+ if (this.usCitizenship == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.usCitizenship);
+ }
+ first = false;
+ }
+ if (isSetEthnicities()) {
+ if (!first) sb.append(", ");
+ sb.append("ethnicities:");
+ if (this.ethnicities == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ethnicities);
+ }
+ first = false;
+ }
+ if (isSetRaces()) {
+ if (!first) sb.append(", ");
+ sb.append("races:");
+ if (this.races == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.races);
+ }
+ first = false;
+ }
+ if (isSetDisabilities()) {
+ if (!first) sb.append(", ");
+ sb.append("disabilities:");
+ if (this.disabilities == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.disabilities);
+ }
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ // check for sub-struct validity
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class NSFDemographicsStandardSchemeFactory implements SchemeFactory {
+ public NSFDemographicsStandardScheme getScheme() {
+ return new NSFDemographicsStandardScheme();
+ }
+ }
+
+ private static class NSFDemographicsStandardScheme extends StandardScheme<NSFDemographics> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, NSFDemographics 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: // GENDER
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gender = iprot.readString();
+ struct.setGenderIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // US_CITIZENSHIP
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.usCitizenship = org.apache.airavata.model.user.USCitizenship.findByValue(iprot.readI32());
+ struct.setUsCitizenshipIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // ETHNICITIES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.ethnicities = new ArrayList<ethnicity>(_list0.size);
+ ethnicity _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = org.apache.airavata.model.user.ethnicity.findByValue(iprot.readI32());
+ struct.ethnicities.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
+ struct.setEthnicitiesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // RACES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
+ struct.races = new ArrayList<race>(_list3.size);
+ race _elem4;
+ for (int _i5 = 0; _i5 < _list3.size; ++_i5)
+ {
+ _elem4 = org.apache.airavata.model.user.race.findByValue(iprot.readI32());
+ struct.races.add(_elem4);
+ }
+ iprot.readListEnd();
+ }
+ struct.setRacesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // DISABILITIES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
+ struct.disabilities = new ArrayList<disability>(_list6.size);
+ disability _elem7;
+ for (int _i8 = 0; _i8 < _list6.size; ++_i8)
+ {
+ _elem7 = org.apache.airavata.model.user.disability.findByValue(iprot.readI32());
+ struct.disabilities.add(_elem7);
+ }
+ iprot.readListEnd();
+ }
+ struct.setDisabilitiesIsSet(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, NSFDemographics struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.gender != null) {
+ if (struct.isSetGender()) {
+ oprot.writeFieldBegin(GENDER_FIELD_DESC);
+ oprot.writeString(struct.gender);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.usCitizenship != null) {
+ if (struct.isSetUsCitizenship()) {
+ oprot.writeFieldBegin(US_CITIZENSHIP_FIELD_DESC);
+ oprot.writeI32(struct.usCitizenship.getValue());
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.ethnicities != null) {
+ if (struct.isSetEthnicities()) {
+ oprot.writeFieldBegin(ETHNICITIES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.ethnicities.size()));
+ for (ethnicity _iter9 : struct.ethnicities)
+ {
+ oprot.writeI32(_iter9.getValue());
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.races != null) {
+ if (struct.isSetRaces()) {
+ oprot.writeFieldBegin(RACES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.races.size()));
+ for (race _iter10 : struct.races)
+ {
+ oprot.writeI32(_iter10.getValue());
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.disabilities != null) {
+ if (struct.isSetDisabilities()) {
+ oprot.writeFieldBegin(DISABILITIES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.disabilities.size()));
+ for (disability _iter11 : struct.disabilities)
+ {
+ oprot.writeI32(_iter11.getValue());
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class NSFDemographicsTupleSchemeFactory implements SchemeFactory {
+ public NSFDemographicsTupleScheme getScheme() {
+ return new NSFDemographicsTupleScheme();
+ }
+ }
+
+ private static class NSFDemographicsTupleScheme extends TupleScheme<NSFDemographics> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, NSFDemographics struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetGender()) {
+ optionals.set(0);
+ }
+ if (struct.isSetUsCitizenship()) {
+ optionals.set(1);
+ }
+ if (struct.isSetEthnicities()) {
+ optionals.set(2);
+ }
+ if (struct.isSetRaces()) {
+ optionals.set(3);
+ }
+ if (struct.isSetDisabilities()) {
+ optionals.set(4);
+ }
+ oprot.writeBitSet(optionals, 5);
+ if (struct.isSetGender()) {
+ oprot.writeString(struct.gender);
+ }
+ if (struct.isSetUsCitizenship()) {
+ oprot.writeI32(struct.usCitizenship.getValue());
+ }
+ if (struct.isSetEthnicities()) {
+ {
+ oprot.writeI32(struct.ethnicities.size());
+ for (ethnicity _iter12 : struct.ethnicities)
+ {
+ oprot.writeI32(_iter12.getValue());
+ }
+ }
+ }
+ if (struct.isSetRaces()) {
+ {
+ oprot.writeI32(struct.races.size());
+ for (race _iter13 : struct.races)
+ {
+ oprot.writeI32(_iter13.getValue());
+ }
+ }
+ }
+ if (struct.isSetDisabilities()) {
+ {
+ oprot.writeI32(struct.disabilities.size());
+ for (disability _iter14 : struct.disabilities)
+ {
+ oprot.writeI32(_iter14.getValue());
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, NSFDemographics struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(5);
+ if (incoming.get(0)) {
+ struct.gender = iprot.readString();
+ struct.setGenderIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.usCitizenship = org.apache.airavata.model.user.USCitizenship.findByValue(iprot.readI32());
+ struct.setUsCitizenshipIsSet(true);
+ }
+ if (incoming.get(2)) {
+ {
+ org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.ethnicities = new ArrayList<ethnicity>(_list15.size);
+ ethnicity _elem16;
+ for (int _i17 = 0; _i17 < _list15.size; ++_i17)
+ {
+ _elem16 = org.apache.airavata.model.user.ethnicity.findByValue(iprot.readI32());
+ struct.ethnicities.add(_elem16);
+ }
+ }
+ struct.setEthnicitiesIsSet(true);
+ }
+ if (incoming.get(3)) {
+ {
+ org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.races = new ArrayList<race>(_list18.size);
+ race _elem19;
+ for (int _i20 = 0; _i20 < _list18.size; ++_i20)
+ {
+ _elem19 = org.apache.airavata.model.user.race.findByValue(iprot.readI32());
+ struct.races.add(_elem19);
+ }
+ }
+ struct.setRacesIsSet(true);
+ }
+ if (incoming.get(4)) {
+ {
+ org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.disabilities = new ArrayList<disability>(_list21.size);
+ disability _elem22;
+ for (int _i23 = 0; _i23 < _list21.size; ++_i23)
+ {
+ _elem22 = org.apache.airavata.model.user.disability.findByValue(iprot.readI32());
+ struct.disabilities.add(_elem22);
+ }
+ }
+ struct.setDisabilitiesIsSet(true);
+ }
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java
new file mode 100644
index 0000000..8360fe9
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/Status.java
@@ -0,0 +1,98 @@
+/**
+ * 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.user;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+public enum Status implements org.apache.thrift.TEnum {
+ ACTIVE(0),
+ CONFIRMED(1),
+ APPROVED(2),
+ DELETED(3),
+ DUPLICATE(4),
+ GRACE_PERIOD(5),
+ INVITED(6),
+ DENIED(7),
+ PENDING(8),
+ PENDING_APPROVAL(9),
+ PENDING_CONFIRMATION(10),
+ SUSPENDED(11),
+ DECLINED(12),
+ EXPIRED(13);
+
+ private final int value;
+
+ private Status(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static Status findByValue(int value) {
+ switch (value) {
+ case 0:
+ return ACTIVE;
+ case 1:
+ return CONFIRMED;
+ case 2:
+ return APPROVED;
+ case 3:
+ return DELETED;
+ case 4:
+ return DUPLICATE;
+ case 5:
+ return GRACE_PERIOD;
+ case 6:
+ return INVITED;
+ case 7:
+ return DENIED;
+ case 8:
+ return PENDING;
+ case 9:
+ return PENDING_APPROVAL;
+ case 10:
+ return PENDING_CONFIRMATION;
+ case 11:
+ return SUSPENDED;
+ case 12:
+ return DECLINED;
+ case 13:
+ return EXPIRED;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/75a87bb6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java
new file mode 100644
index 0000000..231654b
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/USCitizenship.java
@@ -0,0 +1,69 @@
+/**
+ * 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.user;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+/**
+ * U.S. Citizen (see: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+ *
+ */
+public enum USCitizenship implements org.apache.thrift.TEnum {
+ US_CITIZEN(0),
+ US_PERMANENT_RESIDENT(1),
+ OTHER_NON_US_CITIZEN(2);
+
+ private final int value;
+
+ private USCitizenship(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static USCitizenship findByValue(int value) {
+ switch (value) {
+ case 0:
+ return US_CITIZEN;
+ case 1:
+ return US_PERMANENT_RESIDENT;
+ case 2:
+ return OTHER_NON_US_CITIZEN;
+ default:
+ return null;
+ }
+ }
+}
[16/18] airavata git commit: adding initial version of the group
manager data models and CPI
Posted by sc...@apache.org.
adding initial version of the group manager data models and CPI
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/361357e8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/361357e8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/361357e8
Branch: refs/heads/develop
Commit: 361357e8d816d68c0ae707620ee73cfe9eb58c8e
Parents: 75a87bb
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 20 16:23:17 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 20 16:23:17 2016 -0400
----------------------------------------------------------------------
.../user-group-models/group_manager_cpi.thrift | 95 ++++++++++++++++++++
.../group_manager_model.thrift | 93 +++++++++++++++++++
2 files changed, 188 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/361357e8/thrift-interface-descriptions/data-models/user-group-models/group_manager_cpi.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-group-models/group_manager_cpi.thrift b/thrift-interface-descriptions/data-models/user-group-models/group_manager_cpi.thrift
new file mode 100644
index 0000000..5b17fcd
--- /dev/null
+++ b/thrift-interface-descriptions/data-models/user-group-models/group_manager_cpi.thrift
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ *
+ */
+
+include "./group_manager_model.thrift"
+
+namespace java org.apache.airavata.group.cpi
+
+service GroupManagerService {
+
+ /**
+ * Resources related API methods
+ **/
+ string registerResource(group_manager_model.Resource resource);
+
+ bool updateResource(group_manager_model.Resource resource);
+
+ bool deleteResource(string resourceId);
+
+ group_manager_model.Resource getResource(string resourceId);
+
+
+ /**
+ * Users related API methods
+ **/
+ bool registerUser(group_manager_model.User user);
+
+ bool updateUser(group_manager_model.User user);
+
+ bool deleteUser(string grouperUserId);
+
+ group_manager_model.User getUser(string grouperUserId);
+
+ bool assignUserToGroup(string grouperUserId, string groupId);
+
+ bool removeUserFromGroup(string grouperUserId, string groupId);
+
+ list<group_manager_model.GroupMembership> getAllGroupMembershipsForUser(string grouperUserId);
+
+
+ /**
+ * Groups related API methods
+ **/
+ string registerGroup(group_manager_model.Group group);
+
+ bool updateGroup(group_manager_model.Group group);
+
+ bool deleteGroup(string groupId);
+
+ group_manager_model.Group getGroup(string groupdId);
+
+ bool addGroupToGroup(string parentGroupId, string childGroupId);
+
+ bool removeGroupFromGroup(string parentGroupId, string childGroupId);
+
+ list<group_manager_model.GroupMembership> getAllMembersForTheGroup(string groupId);
+
+
+ /**
+ * Grant Revoke Permissions API methods
+ **/
+ bool grantPermissions(string subjectId, group_manager_model.SubjectType subjectType, string resourceId,
+ list<group_manager_model.ResourcePermissionType> grantPermissions, bool recursively)
+
+ bool revokePermissions(string subjectId, group_manager_model.SubjectType subjectType, string resourceId,
+ list<group_manager_model.ResourcePermissionType> revokePermissiones,bool recursively)
+
+ bool revokeAllPermissions(string subjectId, group_manager_model.SubjectType subjectType, string resourceId, bool recursively)
+
+
+ /**
+ * Browse and Search Related API method
+ **/
+ list<group_manager_model.Resource> getAccessibleResourcesForUser(string grouperUserId, group_manager_model.ResourceType resourceType,
+ list<group_manager_model.ResourcePermissionType> permissions, i32 offset, i32 limit)
+
+ list<group_manager_model.Resource> searcgAccessibleResourcesForUser(string grouperUserId, group_manager_model.ResourceType resourceType,
+ list<group_manager_model.ResourcePermissionType> permissions, map<string,string> filters, i32 offset, i32 limit)
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/361357e8/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift b/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
new file mode 100644
index 0000000..7783841
--- /dev/null
+++ b/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ *
+ */
+
+ include "../../airavata-apis/airavata_commons.thrift"
+
+ namespace java org.apache.airavata.model.group
+ namespace php Airavata.Model.Group
+ namespace cpp apache.airavata.model.group
+ namespace py apache.airavata.model.group
+
+const string GROUP_MANAGER_VERSION = "1.0"
+
+
+enum ResourceType {
+ PROJECT,
+ EXPERIMENT,
+ FILE,
+ OTHER
+}
+
+enum ResourcePermissionType {
+ READ_WRITE
+ READ_ONLY,
+ WRITE_WRITE_ONLY
+}
+
+struct Resource {
+ 1: required string resourceId = airavata_commons.DEFAULT_ID,
+ 2: required string resourceName,
+ 3: required ResourceType resourceType,
+ 4: required string ownerId,
+ 5: optional string resourceDescription,
+ 6: optional i64 createdTime,
+ 7: optional i64 lastModifiedTime,
+ 8: optional string parentResourceId,
+ 9: optional list<Resource> childResources,
+ 10: optional map<string,string> metadata
+}
+
+struct Group{
+ 1: required string groupId = airavata_commons.DEFAULT_ID,
+ 2: required string groupName,
+ 3: optional string description,
+ 4: optional list<User> directGroupMemberUsers,
+ 5: optional list<Group> directGroupMemeberGroups,
+ 6: optional list<User> indirectGroupMemeberUsers,
+ 7: optional list<Group> indirectGroupMemeberGroups
+ 8: optional map<string,string> metadata
+}
+
+struct User {
+ 1: required string grouperUserId = airavata_commons.DEFAULT_ID,
+ 2: required string airavataUserId,
+ 3: required string userName,
+ 4: required string gatewayId
+ 5: optional map<string,string> metadata
+}
+
+enum SubjectType {
+ USER,
+ GROUP
+}
+
+enum GroupMembershipType {
+ DIRECT,
+ INDIRECT
+}
+
+struct GroupMembership{
+ 1: required string parentSubjectId,
+ 2: required string childSubjectId,
+ 3: required SubjectType childSubjectType,
+ 4: required string parentSubjectName,
+ 5: required string childSubjectName,
+ 6: required GroupMembershipType groupMembershipType
+}
\ No newline at end of file
[06/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f0198a43
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f0198a43
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f0198a43
Branch: refs/heads/develop
Commit: f0198a43a62e2ff1ab403e76d3e7699a9ca1ef48
Parents: 3dce244 5444ba3
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 28 18:05:06 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 28 18:05:06 2016 -0400
----------------------------------------------------------------------
.../airavata/gfac/impl/task/BESJobSubmissionTask.java | 10 ++++++----
.../gfac/impl/task/utils/bes/DataTransferrer.java | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[17/18] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
# airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/36afbe64
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/36afbe64
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/36afbe64
Branch: refs/heads/develop
Commit: 36afbe6478f9918981a284dfa910fa41be9a021b
Parents: 361357e a79e690
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 20 16:23:38 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 20 16:23:38 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
modules/monitoring/pom.xml | 13 +++
.../airavata/monitoring/MessageExtract.java | 109 +++++++++++++++++++
.../org/apache/airavata/monitoring/Util.java | 37 +++++++
.../monitoring/consumer/EmailConsumer.java | 84 ++++++++++++++
.../monitoring/consumer/EmailReceiver.java | 60 ++++++++++
.../monitoring/mailbox/GmailSMTPMailBox.java | 78 +++++++++++++
.../airavata/monitoring/mailbox/MailBox.java | 19 ++++
.../producer/RabbitMQEmailPublisher.java | 94 ++++++++++++++++
.../monitoring/simulator/FetchPublish.java | 39 +++++++
.../monitoring/simulator/Simulator.java | 50 +++++++++
94 files changed, 667 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
[03/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab262c70
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab262c70
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab262c70
Branch: refs/heads/develop
Commit: ab262c7061ab395df3c61ecf2e455e041b64b689
Parents: 7e7e3a9 5f484b9
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Mar 25 17:21:56 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Mar 25 17:21:56 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 119 +-
.../api/server/handler/utils/DataCatInit.java | 315 -
.../server/handler/utils/ReplicaCatInit.java | 315 +
.../java/org/apache/airavata/api/Airavata.java | 39596 ++++++++---------
.../main/resources/lib/airavata/Airavata.cpp | 2060 +-
.../src/main/resources/lib/airavata/Airavata.h | 820 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 61 +-
.../airavata/application_io_models_types.cpp | 44 +
.../lib/airavata/application_io_models_types.h | 24 +-
.../airavata/compute_resource_model_types.cpp | 50 +-
.../lib/airavata/compute_resource_model_types.h | 18 +-
.../airavata/data_catalog_models_constants.cpp | 34 +
.../airavata/data_catalog_models_constants.h | 41 +
.../lib/airavata/data_catalog_models_types.cpp | 867 +
.../lib/airavata/data_catalog_models_types.h | 363 +
.../lib/airavata/process_model_types.cpp | 22 +
.../lib/airavata/process_model_types.h | 12 +-
.../replica_catalog_models_constants.cpp | 2 +-
.../airavata/replica_catalog_models_constants.h | 2 +-
.../airavata/replica_catalog_models_types.cpp | 434 +-
.../lib/airavata/replica_catalog_models_types.h | 143 +-
.../resources/lib/Airavata/API/Airavata.php | 1014 +-
.../Model/AppCatalog/ComputeResource/Types.php | 44 +-
.../lib/Airavata/Model/Application/Io/Types.php | 46 +
.../lib/Airavata/Model/Data/Product/Types.php | 879 +
.../lib/Airavata/Model/Data/Replica/Types.php | 803 +
.../lib/Airavata/Model/Process/Types.php | 23 +
.../lib/apache/airavata/api/Airavata-remote | 59 +-
.../lib/apache/airavata/api/Airavata.py | 980 +-
.../resources/lib/apache/airavata/api/ttypes.py | 2 +-
.../model/appcatalog/computeresource/ttypes.py | 34 +-
.../airavata/model/application/io/ttypes.py | 30 +-
.../airavata/model/data/product/__init__.py | 1 +
.../airavata/model/data/product/constants.py | 11 +
.../airavata/model/data/product/ttypes.py | 549 +
.../airavata/model/data/replica/__init__.py | 1 +
.../airavata/model/data/replica/constants.py | 11 +
.../airavata/model/data/replica/ttypes.py | 511 +
.../lib/apache/airavata/model/process/ttypes.py | 15 +-
.../lib/apache/airavata/model/ttypes.py | 2 +-
.../client/samples/DataManagerSample.java | 79 -
.../client/samples/ReplicaCatalogSample.java | 72 +
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 209 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 116 +-
.../application/io/OutputDataObjectType.java | 116 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 1677 +
.../model/data/replica/DataProductType.java | 62 +
.../data/replica/DataReplicaLocationModel.java | 1635 +
.../data/replica/ReplicaLocationCategory.java | 68 +
.../data/replica/ReplicaPersistentType.java | 62 +
.../data/resource/DataReplicaLocationModel.java | 1635 -
.../model/data/resource/DataResourceModel.java | 1837 -
.../model/data/resource/DataResourceType.java | 62 -
.../data/resource/ReplicaLocationCategory.java | 68 -
.../data/resource/ReplicaPersistentType.java | 62 -
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 116 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../model/util/ExperimentModelUtil.java | 1 +
.../main/resources/airavata-server.properties | 14 +-
.../server/src/main/resources/gfac-config.yaml | 2 +-
.../test/resources/airavata-server.properties | 29 +-
modules/data-manager/data-manager-core/pom.xml | 61 -
.../data/manager/core/DataManagerFactory.java | 34 -
.../data/manager/core/DataManagerImpl.java | 444 -
.../data/manager/core/ssh/CommandOutput.java | 34 -
.../data/manager/core/ssh/SSHApiException.java | 33 -
.../data/manager/core/ssh/SSHUtils.java | 506 -
.../manager/core/ssh/StandardOutReader.java | 86 -
.../manager/core/DataManagerFactoryTest.java | 45 -
.../data/manager/core/DataManagerImplTest.java | 208 -
.../data/manager/core/utils/AppCatInit.java | 320 -
.../data/manager/core/utils/DataCatInit.java | 315 -
modules/data-manager/data-manager-cpi/pom.xml | 30 -
.../airavata/data/manager/cpi/DataManager.java | 121 -
.../data/manager/cpi/DataManagerConstants.java | 28 -
.../data/manager/cpi/DataManagerException.java | 35 -
modules/data-manager/pom.xml | 54 -
.../apache/airavata/gfac/core/GFacUtils.java | 19 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 12 +-
.../gfac/impl/task/BESJobSubmissionTask.java | 70 +-
.../gfac/impl/task/SCPDataStageTask.java | 4 +-
.../impl/task/utils/bes/DataTransferrer.java | 83 +-
.../task/utils/bes/UNICORESecurityContext.java | 7 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 9 +-
.../server/OrchestratorServerHandler.java | 37 +-
.../core/data/catalog/impl/DataCatalogImpl.java | 286 -
.../core/data/catalog/model/Configuration.java | 55 -
.../data/catalog/model/DataReplicaLocation.java | 169 -
.../data/catalog/model/DataReplicaMetaData.java | 77 -
.../catalog/model/DataReplicaMetaData_PK.java | 59 -
.../core/data/catalog/model/DataResource.java | 177 -
.../catalog/model/DataResourceMetaData.java | 77 -
.../catalog/model/DataResourceMetaData_PK.java | 59 -
.../catalog/utils/DataCatalogConstants.java | 49 -
.../data/catalog/utils/DataCatalogJPAUtils.java | 82 -
.../utils/DataCatalogQueryGenerator.java | 111 -
.../utils/ThriftDataModelConversion.java | 213 -
.../catalog/impl/ExperimentRegistry.java | 11 +-
.../catalog/impl/RegistryFactory.java | 10 +-
.../catalog/model/ExperimentInput.java | 10 +
.../catalog/model/ExperimentOutput.java | 11 +
.../core/experiment/catalog/model/Process.java | 10 +
.../experiment/catalog/model/ProcessInput.java | 11 +
.../experiment/catalog/model/ProcessOutput.java | 11 +
.../resources/ExperimentInputResource.java | 10 +
.../resources/ExperimentOutputResource.java | 10 +
.../catalog/resources/ProcessInputResource.java | 10 +
.../resources/ProcessOutputResource.java | 10 +
.../catalog/resources/ProcessResource.java | 10 +
.../experiment/catalog/resources/Utils.java | 1 +
.../utils/ThriftDataModelConversion.java | 5 +
.../registry/core/impl/RegistryImpl.java | 6 +-
.../catalog/impl/ReplicaCatalogImpl.java | 366 +
.../replica/catalog/model/Configuration.java | 55 +
.../core/replica/catalog/model/DataProduct.java | 177 +
.../catalog/model/DataProductMetaData.java | 77 +
.../catalog/model/DataProductMetaData_PK.java | 59 +
.../catalog/model/DataReplicaLocation.java | 169 +
.../catalog/model/DataReplicaMetaData.java | 77 +
.../catalog/model/DataReplicaMetaData_PK.java | 59 +
.../catalog/utils/ReplicaCatalogConstants.java | 49 +
.../catalog/utils/ReplicaCatalogJPAUtils.java | 82 +
.../utils/ReplicaCatalogQueryGenerator.java | 111 +
.../utils/ThriftDataModelConversion.java | 203 +
.../src/main/resources/META-INF/persistence.xml | 12 +-
.../src/main/resources/datacatalog-derby.sql | 77 -
.../src/main/resources/datacatalog-mysql.sql | 76 -
.../src/main/resources/expcatalog-derby.sql | 5 +
.../src/main/resources/expcatalog-mysql.sql | 5 +
.../src/main/resources/replicacatalog-derby.sql | 77 +
.../src/main/resources/replicacatalog-mysql.sql | 76 +
.../airavata/data/catalog/DataCatalogTest.java | 219 -
.../airavata/data/catalog/util/Initialize.java | 315 -
.../replica/catalog/ReplicaCatalogTest.java | 99 +
.../replica/catalog/util/Initialize.java | 315 +
.../src/test/resources/datacatalog-derby.sql | 52 -
.../airavata/registry/cpi/DataCatalog.java | 45 -
.../registry/cpi/DataCatalogException.java | 36 -
.../apache/airavata/registry/cpi/Registry.java | 2 +-
.../airavata/registry/cpi/ReplicaCatalog.java | 54 +
.../registry/cpi/ReplicaCatalogException.java | 35 +
pom.xml | 1 -
.../airavata-apis/airavata_api.thrift | 91 +-
.../data-models/airavata_data_models.thrift | 2 +-
.../application_io_models.thrift | 6 +-
.../replica_catalog_models.thrift | 74 -
.../process_model.thrift | 3 +-
.../replica_catalog_models.thrift | 70 +
.../compute_resource_model.thrift | 4 +-
224 files changed, 32384 insertions(+), 33427 deletions(-)
----------------------------------------------------------------------
[04/18] airavata git commit: Merge branch 'develop'
Posted by sc...@apache.org.
Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eeb10167
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eeb10167
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eeb10167
Branch: refs/heads/develop
Commit: eeb101679bc78eb902c11bcc4632db5e96264cc4
Parents: ab262c7 7bde79b
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Mar 25 18:33:22 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Mar 25 18:33:22 2016 -0400
----------------------------------------------------------------------
.../gfac/impl/task/BESJobSubmissionTask.java | 137 +++++++++++++++++--
.../impl/task/utils/bes/DataTransferrer.java | 14 +-
2 files changed, 134 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[18/18] airavata git commit: fixing merge conflicts
Posted by sc...@apache.org.
fixing merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c3ca6814
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c3ca6814
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c3ca6814
Branch: refs/heads/develop
Commit: c3ca681449bbf5ff4b3b937a2ca48284373f4395
Parents: 36afbe6 0f962e7
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 20 16:25:06 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 20 16:25:06 2016 -0400
----------------------------------------------------------------------
README | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[10/18] airavata git commit: adding travis yml file
Posted by sc...@apache.org.
adding travis yml file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4845de48
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4845de48
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4845de48
Branch: refs/heads/develop
Commit: 4845de489c539ca388e8b7d5746fd309209170aa
Parents: fad2174
Author: Suresh Marru <sm...@apache.org>
Authored: Fri May 13 11:05:46 2016 -0700
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri May 13 11:05:46 2016 -0700
----------------------------------------------------------------------
.travis.yml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4845de48/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..9f7f8b7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: java
+
+sudo: false
+
+notifications:
+ email:
+ on_success: change
+ on_failure: always
+
+jdk:
+ - oraclejdk8
+
+script: mvn clean install
\ No newline at end of file