From commits-return-20508-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Wed May 1 18:59:12 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id A714D180629 for ; Wed, 1 May 2019 20:59:11 +0200 (CEST) Received: (qmail 94503 invoked by uid 500); 1 May 2019 18:59:11 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 94489 invoked by uid 99); 1 May 2019 18:59:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2019 18:59:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CDC258719B; Wed, 1 May 2019 18:59:10 +0000 (UTC) Date: Wed, 01 May 2019 18:59:10 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch master updated: Adding the base api to service cpis MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155673715072.22417.2674545551694980822@gitbox.apache.org> From: dimuthuupe@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 82c57c7d637be78a16ab4f954a54ce70d56e2f12 X-Git-Newrev: 55b3dd6b9f958871288be7db482a885b41c09503 X-Git-Rev: 55b3dd6b9f958871288be7db482a885b41c09503 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/master by this push: new 55b3dd6 Adding the base api to service cpis 55b3dd6 is described below commit 55b3dd6b9f958871288be7db482a885b41c09503 Author: Dimuthu Wannipurage AuthorDate: Wed May 1 14:59:00 2019 -0400 Adding the base api to service cpis --- .../handlers/GroupManagerServiceHandler.java | 6 + .../profile/handlers/IamAdminServicesHandler.java | 12 +- .../handlers/TenantProfileServiceHandler.java | 12 +- .../handlers/UserProfileServiceHandler.java | 6 + .../profile-service/profile-service-stubs/pom.xml | 5 + .../groupmanager/cpi/GroupManagerService.java | 12 +- .../cpi/group_manager_cpiConstants.java | 2 +- .../iam/admin/services/cpi/IamAdminServices.java | 1127 +------------------- .../cpi/exception/IamAdminServicesException.java | 19 - .../cpi/iam_admin_services_cpiConstants.java | 21 +- .../profile/tenant/cpi/TenantProfileService.java | 1127 +------------------- .../exception/TenantProfileServiceException.java | 19 - .../tenant/cpi/profile_tenant_cpiConstants.java | 21 +- .../profile/user/cpi/UserProfileService.java | 31 +- .../cpi/exception/UserProfileServiceException.java | 19 - .../user/cpi/profile_user_cpiConstants.java | 21 +- .../service-cpis/generate-service-cpi-stubs.sh | 19 +- 17 files changed, 66 insertions(+), 2413 deletions(-) diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java index 1b7ebfb..cfd0e79 100644 --- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java +++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java @@ -8,6 +8,7 @@ import org.apache.airavata.model.group.GroupModel; import org.apache.airavata.model.security.AuthzToken; import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService; import org.apache.airavata.service.profile.groupmanager.cpi.exception.GroupManagerServiceException; +import org.apache.airavata.service.profile.groupmanager.cpi.group_manager_cpiConstants; import org.apache.airavata.service.security.interceptor.SecurityCheck; import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.GroupType; @@ -31,6 +32,11 @@ public class GroupManagerServiceHandler implements GroupManagerService.Iface { } @Override + public String getAPIVersion() throws TException { + return group_manager_cpiConstants.GROUP_MANAGER_CPI_VERSION; + } + + @Override @SecurityCheck public String createGroup(AuthzToken authzToken, GroupModel groupModel) throws GroupManagerServiceException, AuthorizationException, TException { try { diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java index f27b4f1..ab5ddfb 100644 --- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java +++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/IamAdminServicesHandler.java @@ -49,17 +49,9 @@ public class IamAdminServicesHandler implements IamAdminServices.Iface { private final static Logger logger = LoggerFactory.getLogger(IamAdminServicesHandler.class); - @Override - public String getAPIVersion(AuthzToken authzToken) throws IamAdminServicesException, AuthorizationException { - try { - return iam_admin_services_cpiConstants.IAM_ADMIN_SERVICES_CPI_VERSION; - } catch (Exception ex) { - logger.error("Error getting API version, reason: " + ex.getMessage(), ex); - IamAdminServicesException exception = new IamAdminServicesException(); - exception.setMessage("Error getting API version, reason: " + ex.getMessage()); - throw exception; - } + public String getAPIVersion() throws TException { + return iam_admin_services_cpiConstants.IAM_ADMIN_SERVICES_CPI_VERSION; } @Override diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java index 9ca65ed..1a818ab 100644 --- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java +++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/TenantProfileServiceHandler.java @@ -63,16 +63,8 @@ public class TenantProfileServiceHandler implements TenantProfileService.Iface { } @Override - @SecurityCheck - public String getAPIVersion(AuthzToken authzToken) throws TenantProfileServiceException, AuthorizationException, TException { - try { - return profile_tenant_cpiConstants.TENANT_PROFILE_CPI_VERSION; - } catch (Exception ex) { - logger.error("Error getting API version, reason: " + ex.getMessage(), ex); - TenantProfileServiceException exception = new TenantProfileServiceException(); - exception.setMessage("Error getting API version, reason: " + ex.getMessage()); - throw exception; - } + public String getAPIVersion() throws TException { + return profile_tenant_cpiConstants.TENANT_PROFILE_CPI_VERSION; } @Override diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java index 95d27d8..906705d 100644 --- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java +++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/UserProfileServiceHandler.java @@ -36,6 +36,7 @@ import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamA import org.apache.airavata.service.profile.user.core.repositories.UserProfileRepository; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException; +import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants; import org.apache.airavata.service.profile.utils.ProfileServiceUtils; import org.apache.airavata.service.security.interceptor.SecurityCheck; import org.apache.thrift.TException; @@ -56,6 +57,11 @@ public class UserProfileServiceHandler implements UserProfileService.Iface { } @Override + public String getAPIVersion() throws TException { + return profile_user_cpiConstants.USER_PROFILE_CPI_VERSION; + } + + @Override @SecurityCheck public String addUserProfile(AuthzToken authzToken, UserProfile userProfile) throws UserProfileServiceException, AuthorizationException, TException { try{ diff --git a/airavata-services/profile-service/profile-service-stubs/pom.xml b/airavata-services/profile-service/profile-service-stubs/pom.xml index 18b6ef9..1ecd799 100644 --- a/airavata-services/profile-service/profile-service-stubs/pom.xml +++ b/airavata-services/profile-service/profile-service-stubs/pom.xml @@ -39,6 +39,11 @@ org.apache.airavata + airavata-base-api + ${project.version} + + + org.apache.airavata airavata-data-models ${project.version} diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/GroupManagerService.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/GroupManagerService.java index 7950e6f..c983118 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/GroupManagerService.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/GroupManagerService.java @@ -26,7 +26,7 @@ package org.apache.airavata.service.profile.groupmanager.cpi; @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class GroupManagerService { - public interface Iface { + public interface Iface extends org.apache.airavata.base.api.BaseAPI.Iface { public java.lang.String createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.service.profile.groupmanager.cpi.exception.GroupManagerServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; @@ -50,7 +50,7 @@ public class GroupManagerService { } - public interface AsyncIface { + public interface AsyncIface extends org.apache.airavata.base.api.BaseAPI .AsyncIface { public void createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -74,7 +74,7 @@ public class GroupManagerService { } - public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Client extends org.apache.airavata.base.api.BaseAPI.Client implements Iface { public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} public Client getClient(org.apache.thrift.protocol.TProtocol prot) { @@ -401,7 +401,7 @@ public class GroupManagerService { } } - public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class AsyncClient extends org.apache.airavata.base.api.BaseAPI.AsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { private org.apache.thrift.async.TAsyncClientManager clientManager; private org.apache.thrift.protocol.TProtocolFactory protocolFactory; @@ -788,7 +788,7 @@ public class GroupManagerService { } - public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { + public static class Processor extends org.apache.airavata.base.api.BaseAPI.Processor implements org.apache.thrift.TProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); @@ -1081,7 +1081,7 @@ public class GroupManagerService { } - public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + public static class AsyncProcessor extends org.apache.airavata.base.api.BaseAPI.AsyncProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/group_manager_cpiConstants.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/group_manager_cpiConstants.java index d83fab3..841b353 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/group_manager_cpiConstants.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/groupmanager/cpi/group_manager_cpiConstants.java @@ -25,7 +25,7 @@ package org.apache.airavata.service.profile.groupmanager.cpi; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class group_manager_cpiConstants { - public static final java.lang.String GROUP_MANAGER_CPI_VERSION = "0.17"; + public static final java.lang.String GROUP_MANAGER_CPI_VERSION = "0.18.0"; public static final java.lang.String GROUP_MANAGER_CPI_NAME = "GroupManagerService"; diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/IamAdminServices.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/IamAdminServices.java index 22bdb88..b1642a1 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/IamAdminServices.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/IamAdminServices.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -45,9 +26,7 @@ package org.apache.airavata.service.profile.iam.admin.services.cpi; @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class IamAdminServices { - public interface Iface { - - public java.lang.String getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public interface Iface extends org.apache.airavata.base.api.BaseAPI.Iface { public org.apache.airavata.model.workspace.Gateway setUpGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway) throws org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; @@ -71,9 +50,7 @@ public class IamAdminServices { } - public interface AsyncIface { - - public void getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public interface AsyncIface extends org.apache.airavata.base.api.BaseAPI .AsyncIface { public void setUpGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -97,7 +74,7 @@ public class IamAdminServices { } - public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Client extends org.apache.airavata.base.api.BaseAPI.Client implements Iface { public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} public Client getClient(org.apache.thrift.protocol.TProtocol prot) { @@ -117,35 +94,6 @@ public class IamAdminServices { super(iprot, oprot); } - public java.lang.String getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException - { - send_getAPIVersion(authzToken); - return recv_getAPIVersion(); - } - - public void send_getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException - { - getAPIVersion_args args = new getAPIVersion_args(); - args.setAuthzToken(authzToken); - sendBase("getAPIVersion", args); - } - - public java.lang.String recv_getAPIVersion() throws org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException - { - getAPIVersion_result result = new getAPIVersion_result(); - receiveBase(result, "getAPIVersion"); - if (result.isSetSuccess()) { - return result.success; - } - if (result.Idse != null) { - throw result.Idse; - } - if (result.ae != null) { - throw result.ae; - } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAPIVersion failed: unknown result"); - } - public org.apache.airavata.model.workspace.Gateway setUpGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway) throws org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { send_setUpGateway(authzToken, gateway); @@ -452,7 +400,7 @@ public class IamAdminServices { } } - public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class AsyncClient extends org.apache.airavata.base.api.BaseAPI.AsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { private org.apache.thrift.async.TAsyncClientManager clientManager; private org.apache.thrift.protocol.TProtocolFactory protocolFactory; @@ -469,38 +417,6 @@ public class IamAdminServices { super(protocolFactory, clientManager, transport); } - public void getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - checkReady(); - getAPIVersion_call method_call = new getAPIVersion_call(authzToken, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); - } - - public static class getAPIVersion_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.airavata.model.security.AuthzToken authzToken; - public getAPIVersion_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { - super(client, protocolFactory, transport, resultHandler, false); - this.authzToken = authzToken; - } - - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAPIVersion", org.apache.thrift.protocol.TMessageType.CALL, 0)); - getAPIVersion_args args = new getAPIVersion_args(); - args.setAuthzToken(authzToken); - args.write(prot); - prot.writeMessageEnd(); - } - - public java.lang.String getResult() throws org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new java.lang.IllegalStateException("Method call not finished!"); - } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); - return (new Client(prot)).recv_getAPIVersion(); - } - } - public void setUpGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); setUpGateway_call method_call = new setUpGateway_call(authzToken, gateway, resultHandler, this, ___protocolFactory, ___transport); @@ -877,7 +793,7 @@ public class IamAdminServices { } - public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { + public static class Processor extends org.apache.airavata.base.api.BaseAPI.Processor implements org.apache.thrift.TProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); @@ -888,7 +804,6 @@ public class IamAdminServices { } private static java.util.Map> getProcessMap(java.util.Map> processMap) { - processMap.put("getAPIVersion", new getAPIVersion()); processMap.put("setUpGateway", new setUpGateway()); processMap.put("registerUser", new registerUser()); processMap.put("enableUser", new enableUser()); @@ -902,32 +817,6 @@ public class IamAdminServices { return processMap; } - public static class getAPIVersion extends org.apache.thrift.ProcessFunction { - public getAPIVersion() { - super("getAPIVersion"); - } - - public getAPIVersion_args getEmptyArgsInstance() { - return new getAPIVersion_args(); - } - - protected boolean isOneway() { - return false; - } - - public getAPIVersion_result getResult(I iface, getAPIVersion_args args) throws org.apache.thrift.TException { - getAPIVersion_result result = new getAPIVersion_result(); - try { - result.success = iface.getAPIVersion(args.authzToken); - } catch (org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException Idse) { - result.Idse = Idse; - } catch (org.apache.airavata.model.error.AuthorizationException ae) { - result.ae = ae; - } - return result; - } - } - public static class setUpGateway extends org.apache.thrift.ProcessFunction { public setUpGateway() { super("setUpGateway"); @@ -1196,7 +1085,7 @@ public class IamAdminServices { } - public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + public static class AsyncProcessor extends org.apache.airavata.base.api.BaseAPI.AsyncProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); @@ -1207,7 +1096,6 @@ public class IamAdminServices { } private static java.util.Map> getProcessMap(java.util.Map> processMap) { - processMap.put("getAPIVersion", new getAPIVersion()); processMap.put("setUpGateway", new setUpGateway()); processMap.put("registerUser", new registerUser()); processMap.put("enableUser", new enableUser()); @@ -1221,75 +1109,6 @@ public class IamAdminServices { return processMap; } - public static class getAPIVersion extends org.apache.thrift.AsyncProcessFunction { - public getAPIVersion() { - super("getAPIVersion"); - } - - public getAPIVersion_args getEmptyArgsInstance() { - return new getAPIVersion_args(); - } - - public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { - public void onComplete(java.lang.String o) { - getAPIVersion_result result = new getAPIVersion_result(); - result.success = o; - try { - fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - } catch (org.apache.thrift.transport.TTransportException e) { - _LOGGER.error("TTransportException writing to internal frame buffer", e); - fb.close(); - } catch (java.lang.Exception e) { - _LOGGER.error("Exception writing to internal frame buffer", e); - onError(e); - } - } - public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; - getAPIVersion_result result = new getAPIVersion_result(); - if (e instanceof org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException) { - result.Idse = (org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException) e; - result.setIdseIsSet(true); - msg = result; - } else if (e instanceof org.apache.airavata.model.error.AuthorizationException) { - result.ae = (org.apache.airavata.model.error.AuthorizationException) e; - result.setAeIsSet(true); - msg = result; - } else if (e instanceof org.apache.thrift.transport.TTransportException) { - _LOGGER.error("TTransportException inside handler", e); - fb.close(); - return; - } else if (e instanceof org.apache.thrift.TApplicationException) { - _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException)e; - } else { - _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); - } - try { - fcall.sendResponse(fb,msg,msgType,seqid); - } catch (java.lang.Exception ex) { - _LOGGER.error("Exception writing to internal frame buffer", ex); - fb.close(); - } - } - }; - } - - protected boolean isOneway() { - return false; - } - - public void start(I iface, getAPIVersion_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.getAPIVersion(args.authzToken,resultHandler); - } - } - public static class setUpGateway extends org.apache.thrift.AsyncProcessFunction { public setUpGateway() { super("setUpGateway"); @@ -1987,940 +1806,6 @@ public class IamAdminServices { } - public static class getAPIVersion_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_args"); - - private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAPIVersion_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAPIVersion_argsTupleSchemeFactory(); - - public org.apache.airavata.model.security.AuthzToken authzToken; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - AUTHZ_TOKEN((short)1, "authzToken"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // AUTHZ_TOKEN - return AUTHZ_TOKEN; - 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 java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - public short getThriftFieldId() { - return _thriftId; - } - - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap); - } - - public getAPIVersion_args() { - } - - public getAPIVersion_args( - org.apache.airavata.model.security.AuthzToken authzToken) - { - this(); - this.authzToken = authzToken; - } - - /** - * Performs a deep copy on other. - */ - public getAPIVersion_args(getAPIVersion_args other) { - if (other.isSetAuthzToken()) { - this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); - } - } - - public getAPIVersion_args deepCopy() { - return new getAPIVersion_args(this); - } - - @Override - public void clear() { - this.authzToken = null; - } - - public org.apache.airavata.model.security.AuthzToken getAuthzToken() { - return this.authzToken; - } - - public getAPIVersion_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) { - this.authzToken = authzToken; - return this; - } - - public void unsetAuthzToken() { - this.authzToken = null; - } - - /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */ - public boolean isSetAuthzToken() { - return this.authzToken != null; - } - - public void setAuthzTokenIsSet(boolean value) { - if (!value) { - this.authzToken = null; - } - } - - public void setFieldValue(_Fields field, java.lang.Object value) { - switch (field) { - case AUTHZ_TOKEN: - if (value == null) { - unsetAuthzToken(); - } else { - setAuthzToken((org.apache.airavata.model.security.AuthzToken)value); - } - break; - - } - } - - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case AUTHZ_TOKEN: - return getAuthzToken(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case AUTHZ_TOKEN: - return isSetAuthzToken(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that == null) - return false; - if (that instanceof getAPIVersion_args) - return this.equals((getAPIVersion_args)that); - return false; - } - - public boolean equals(getAPIVersion_args that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_authzToken = true && this.isSetAuthzToken(); - boolean that_present_authzToken = true && that.isSetAuthzToken(); - if (this_present_authzToken || that_present_authzToken) { - if (!(this_present_authzToken && that_present_authzToken)) - return false; - if (!this.authzToken.equals(that.authzToken)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetAuthzToken()) ? 131071 : 524287); - if (isSetAuthzToken()) - hashCode = hashCode * 8191 + authzToken.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(getAPIVersion_args other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAuthzToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken); - 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 { - scheme(iprot).read(iprot, this); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("getAPIVersion_args("); - boolean first = true; - - sb.append("authzToken:"); - if (this.authzToken == null) { - sb.append("null"); - } else { - sb.append(this.authzToken); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (authzToken == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); - } - // check for sub-struct validity - if (authzToken != null) { - authzToken.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, java.lang.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 getAPIVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_argsStandardScheme getScheme() { - return new getAPIVersion_argsStandardScheme(); - } - } - - private static class getAPIVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_args 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: // AUTHZ_TOKEN - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); - struct.authzToken.read(iprot); - struct.setAuthzTokenIsSet(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(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_args struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.authzToken != null) { - oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC); - struct.authzToken.write(oprot); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class getAPIVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_argsTupleScheme getScheme() { - return new getAPIVersion_argsTupleScheme(); - } - } - - private static class getAPIVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - struct.authzToken.write(oprot); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); - struct.authzToken.read(iprot); - struct.setAuthzTokenIsSet(true); - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - } - - public static class getAPIVersion_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_result"); - - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); - private static final org.apache.thrift.protocol.TField IDSE_FIELD_DESC = new org.apache.thrift.protocol.TField("Idse", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField AE_FIELD_DESC = new org.apache.thrift.protocol.TField("ae", org.apache.thrift.protocol.TType.STRUCT, (short)2); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAPIVersion_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAPIVersion_resultTupleSchemeFactory(); - - public java.lang.String success; // required - public org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException Idse; // required - public org.apache.airavata.model.error.AuthorizationException ae; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SUCCESS((short)0, "success"), - IDSE((short)1, "Idse"), - AE((short)2, "ae"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 0: // SUCCESS - return SUCCESS; - case 1: // IDSE - return IDSE; - case 2: // AE - return AE; - 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 java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - public short getThriftFieldId() { - return _thriftId; - } - - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.IDSE, new org.apache.thrift.meta_data.FieldMetaData("Idse", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException.class))); - tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.error.AuthorizationException.class))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_result.class, metaDataMap); - } - - public getAPIVersion_result() { - } - - public getAPIVersion_result( - java.lang.String success, - org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException Idse, - org.apache.airavata.model.error.AuthorizationException ae) - { - this(); - this.success = success; - this.Idse = Idse; - this.ae = ae; - } - - /** - * Performs a deep copy on other. - */ - public getAPIVersion_result(getAPIVersion_result other) { - if (other.isSetSuccess()) { - this.success = other.success; - } - if (other.isSetIdse()) { - this.Idse = new org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException(other.Idse); - } - if (other.isSetAe()) { - this.ae = new org.apache.airavata.model.error.AuthorizationException(other.ae); - } - } - - public getAPIVersion_result deepCopy() { - return new getAPIVersion_result(this); - } - - @Override - public void clear() { - this.success = null; - this.Idse = null; - this.ae = null; - } - - public java.lang.String getSuccess() { - return this.success; - } - - public getAPIVersion_result setSuccess(java.lang.String success) { - this.success = success; - return this; - } - - public void unsetSuccess() { - this.success = null; - } - - /** Returns true if field success is set (has been assigned a value) and false otherwise */ - public boolean isSetSuccess() { - return this.success != null; - } - - public void setSuccessIsSet(boolean value) { - if (!value) { - this.success = null; - } - } - - public org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException getIdse() { - return this.Idse; - } - - public getAPIVersion_result setIdse(org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException Idse) { - this.Idse = Idse; - return this; - } - - public void unsetIdse() { - this.Idse = null; - } - - /** Returns true if field Idse is set (has been assigned a value) and false otherwise */ - public boolean isSetIdse() { - return this.Idse != null; - } - - public void setIdseIsSet(boolean value) { - if (!value) { - this.Idse = null; - } - } - - public org.apache.airavata.model.error.AuthorizationException getAe() { - return this.ae; - } - - public getAPIVersion_result setAe(org.apache.airavata.model.error.AuthorizationException ae) { - this.ae = ae; - return this; - } - - public void unsetAe() { - this.ae = null; - } - - /** Returns true if field ae is set (has been assigned a value) and false otherwise */ - public boolean isSetAe() { - return this.ae != null; - } - - public void setAeIsSet(boolean value) { - if (!value) { - this.ae = null; - } - } - - public void setFieldValue(_Fields field, java.lang.Object value) { - switch (field) { - case SUCCESS: - if (value == null) { - unsetSuccess(); - } else { - setSuccess((java.lang.String)value); - } - break; - - case IDSE: - if (value == null) { - unsetIdse(); - } else { - setIdse((org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException)value); - } - break; - - case AE: - if (value == null) { - unsetAe(); - } else { - setAe((org.apache.airavata.model.error.AuthorizationException)value); - } - break; - - } - } - - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case SUCCESS: - return getSuccess(); - - case IDSE: - return getIdse(); - - case AE: - return getAe(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case SUCCESS: - return isSetSuccess(); - case IDSE: - return isSetIdse(); - case AE: - return isSetAe(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that == null) - return false; - if (that instanceof getAPIVersion_result) - return this.equals((getAPIVersion_result)that); - return false; - } - - public boolean equals(getAPIVersion_result that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_success = true && this.isSetSuccess(); - boolean that_present_success = true && that.isSetSuccess(); - if (this_present_success || that_present_success) { - if (!(this_present_success && that_present_success)) - return false; - if (!this.success.equals(that.success)) - return false; - } - - boolean this_present_Idse = true && this.isSetIdse(); - boolean that_present_Idse = true && that.isSetIdse(); - if (this_present_Idse || that_present_Idse) { - if (!(this_present_Idse && that_present_Idse)) - return false; - if (!this.Idse.equals(that.Idse)) - return false; - } - - boolean this_present_ae = true && this.isSetAe(); - boolean that_present_ae = true && that.isSetAe(); - if (this_present_ae || that_present_ae) { - if (!(this_present_ae && that_present_ae)) - return false; - if (!this.ae.equals(that.ae)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); - if (isSetSuccess()) - hashCode = hashCode * 8191 + success.hashCode(); - - hashCode = hashCode * 8191 + ((isSetIdse()) ? 131071 : 524287); - if (isSetIdse()) - hashCode = hashCode * 8191 + Idse.hashCode(); - - hashCode = hashCode * 8191 + ((isSetAe()) ? 131071 : 524287); - if (isSetAe()) - hashCode = hashCode * 8191 + ae.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(getAPIVersion_result other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.valueOf(isSetIdse()).compareTo(other.isSetIdse()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetIdse()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.Idse, other.Idse); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.valueOf(isSetAe()).compareTo(other.isSetAe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ae, other.ae); - 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 { - scheme(iprot).read(iprot, this); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("getAPIVersion_result("); - boolean first = true; - - sb.append("success:"); - if (this.success == null) { - sb.append("null"); - } else { - sb.append(this.success); - } - first = false; - if (!first) sb.append(", "); - sb.append("Idse:"); - if (this.Idse == null) { - sb.append("null"); - } else { - sb.append(this.Idse); - } - first = false; - if (!first) sb.append(", "); - sb.append("ae:"); - if (this.ae == null) { - sb.append("null"); - } else { - sb.append(this.ae); - } - 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, java.lang.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 getAPIVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_resultStandardScheme getScheme() { - return new getAPIVersion_resultStandardScheme(); - } - } - - private static class getAPIVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_result 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 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.success = iprot.readString(); - struct.setSuccessIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 1: // IDSE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.Idse = new org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException(); - struct.Idse.read(iprot); - struct.setIdseIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // AE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.ae = new org.apache.airavata.model.error.AuthorizationException(); - struct.ae.read(iprot); - struct.setAeIsSet(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(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_result struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.success != null) { - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - oprot.writeString(struct.success); - oprot.writeFieldEnd(); - } - if (struct.Idse != null) { - oprot.writeFieldBegin(IDSE_FIELD_DESC); - struct.Idse.write(oprot); - oprot.writeFieldEnd(); - } - if (struct.ae != null) { - oprot.writeFieldBegin(AE_FIELD_DESC); - struct.ae.write(oprot); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class getAPIVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_resultTupleScheme getScheme() { - return new getAPIVersion_resultTupleScheme(); - } - } - - private static class getAPIVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetSuccess()) { - optionals.set(0); - } - if (struct.isSetIdse()) { - optionals.set(1); - } - if (struct.isSetAe()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); - if (struct.isSetSuccess()) { - oprot.writeString(struct.success); - } - if (struct.isSetIdse()) { - struct.Idse.write(oprot); - } - if (struct.isSetAe()) { - struct.ae.write(oprot); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); - if (incoming.get(0)) { - struct.success = iprot.readString(); - struct.setSuccessIsSet(true); - } - if (incoming.get(1)) { - struct.Idse = new org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException(); - struct.Idse.read(iprot); - struct.setIdseIsSet(true); - } - if (incoming.get(2)) { - struct.ae = new org.apache.airavata.model.error.AuthorizationException(); - struct.ae.read(iprot); - struct.setAeIsSet(true); - } - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - } - public static class setUpGateway_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setUpGateway_args"); diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/exception/IamAdminServicesException.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/exception/IamAdminServicesException.java index 6a55df0..c4ac522 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/exception/IamAdminServicesException.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/exception/IamAdminServicesException.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/iam_admin_services_cpiConstants.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/iam_admin_services_cpiConstants.java index d867550..24b3b95 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/iam_admin_services_cpiConstants.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/iam/admin/services/cpi/iam_admin_services_cpiConstants.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -44,7 +25,7 @@ package org.apache.airavata.service.profile.iam.admin.services.cpi; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class iam_admin_services_cpiConstants { - public static final java.lang.String IAM_ADMIN_SERVICES_CPI_VERSION = "0.17"; + public static final java.lang.String IAM_ADMIN_SERVICES_CPI_VERSION = "0.18.0"; public static final java.lang.String IAM_ADMIN_SERVICES_CPI_NAME = "IamAdminServices"; diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/TenantProfileService.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/TenantProfileService.java index 2ac3103..8e4a824 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/TenantProfileService.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/TenantProfileService.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -45,9 +26,7 @@ package org.apache.airavata.service.profile.tenant.cpi; @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class TenantProfileService { - public interface Iface { - - public java.lang.String getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + public interface Iface extends org.apache.airavata.base.api.BaseAPI.Iface { /** * Return the airavataInternalGatewayId assigned to given gateway. @@ -71,9 +50,7 @@ public class TenantProfileService { } - public interface AsyncIface { - - public void getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public interface AsyncIface extends org.apache.airavata.base.api.BaseAPI .AsyncIface { public void addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -91,7 +68,7 @@ public class TenantProfileService { } - public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Client extends org.apache.airavata.base.api.BaseAPI.Client implements Iface { public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} public Client getClient(org.apache.thrift.protocol.TProtocol prot) { @@ -111,35 +88,6 @@ public class TenantProfileService { super(iprot, oprot); } - public java.lang.String getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException - { - send_getAPIVersion(authzToken); - return recv_getAPIVersion(); - } - - public void send_getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException - { - getAPIVersion_args args = new getAPIVersion_args(); - args.setAuthzToken(authzToken); - sendBase("getAPIVersion", args); - } - - public java.lang.String recv_getAPIVersion() throws org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException - { - getAPIVersion_result result = new getAPIVersion_result(); - receiveBase(result, "getAPIVersion"); - if (result.isSetSuccess()) { - return result.success; - } - if (result.tpe != null) { - throw result.tpe; - } - if (result.ae != null) { - throw result.ae; - } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAPIVersion failed: unknown result"); - } - public java.lang.String addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway) throws org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { send_addGateway(authzToken, gateway); @@ -351,7 +299,7 @@ public class TenantProfileService { } } - public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class AsyncClient extends org.apache.airavata.base.api.BaseAPI.AsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { private org.apache.thrift.async.TAsyncClientManager clientManager; private org.apache.thrift.protocol.TProtocolFactory protocolFactory; @@ -368,38 +316,6 @@ public class TenantProfileService { super(protocolFactory, clientManager, transport); } - public void getAPIVersion(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - checkReady(); - getAPIVersion_call method_call = new getAPIVersion_call(authzToken, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); - } - - public static class getAPIVersion_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.airavata.model.security.AuthzToken authzToken; - public getAPIVersion_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { - super(client, protocolFactory, transport, resultHandler, false); - this.authzToken = authzToken; - } - - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAPIVersion", org.apache.thrift.protocol.TMessageType.CALL, 0)); - getAPIVersion_args args = new getAPIVersion_args(); - args.setAuthzToken(authzToken); - args.write(prot); - prot.writeMessageEnd(); - } - - public java.lang.String getResult() throws org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new java.lang.IllegalStateException("Method call not finished!"); - } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); - return (new Client(prot)).recv_getAPIVersion(); - } - } - public void addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); addGateway_call method_call = new addGateway_call(authzToken, gateway, resultHandler, this, ___protocolFactory, ___transport); @@ -647,7 +563,7 @@ public class TenantProfileService { } - public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { + public static class Processor extends org.apache.airavata.base.api.BaseAPI.Processor implements org.apache.thrift.TProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); @@ -658,7 +574,6 @@ public class TenantProfileService { } private static java.util.Map> getProcessMap(java.util.Map> processMap) { - processMap.put("getAPIVersion", new getAPIVersion()); processMap.put("addGateway", new addGateway()); processMap.put("updateGateway", new updateGateway()); processMap.put("getGateway", new getGateway()); @@ -669,32 +584,6 @@ public class TenantProfileService { return processMap; } - public static class getAPIVersion extends org.apache.thrift.ProcessFunction { - public getAPIVersion() { - super("getAPIVersion"); - } - - public getAPIVersion_args getEmptyArgsInstance() { - return new getAPIVersion_args(); - } - - protected boolean isOneway() { - return false; - } - - public getAPIVersion_result getResult(I iface, getAPIVersion_args args) throws org.apache.thrift.TException { - getAPIVersion_result result = new getAPIVersion_result(); - try { - result.success = iface.getAPIVersion(args.authzToken); - } catch (org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException tpe) { - result.tpe = tpe; - } catch (org.apache.airavata.model.error.AuthorizationException ae) { - result.ae = ae; - } - return result; - } - } - public static class addGateway extends org.apache.thrift.ProcessFunction { public addGateway() { super("addGateway"); @@ -882,7 +771,7 @@ public class TenantProfileService { } - public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + public static class AsyncProcessor extends org.apache.airavata.base.api.BaseAPI.AsyncProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); @@ -893,7 +782,6 @@ public class TenantProfileService { } private static java.util.Map> getProcessMap(java.util.Map> processMap) { - processMap.put("getAPIVersion", new getAPIVersion()); processMap.put("addGateway", new addGateway()); processMap.put("updateGateway", new updateGateway()); processMap.put("getGateway", new getGateway()); @@ -904,75 +792,6 @@ public class TenantProfileService { return processMap; } - public static class getAPIVersion extends org.apache.thrift.AsyncProcessFunction { - public getAPIVersion() { - super("getAPIVersion"); - } - - public getAPIVersion_args getEmptyArgsInstance() { - return new getAPIVersion_args(); - } - - public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { - public void onComplete(java.lang.String o) { - getAPIVersion_result result = new getAPIVersion_result(); - result.success = o; - try { - fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - } catch (org.apache.thrift.transport.TTransportException e) { - _LOGGER.error("TTransportException writing to internal frame buffer", e); - fb.close(); - } catch (java.lang.Exception e) { - _LOGGER.error("Exception writing to internal frame buffer", e); - onError(e); - } - } - public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; - getAPIVersion_result result = new getAPIVersion_result(); - if (e instanceof org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException) { - result.tpe = (org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException) e; - result.setTpeIsSet(true); - msg = result; - } else if (e instanceof org.apache.airavata.model.error.AuthorizationException) { - result.ae = (org.apache.airavata.model.error.AuthorizationException) e; - result.setAeIsSet(true); - msg = result; - } else if (e instanceof org.apache.thrift.transport.TTransportException) { - _LOGGER.error("TTransportException inside handler", e); - fb.close(); - return; - } else if (e instanceof org.apache.thrift.TApplicationException) { - _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException)e; - } else { - _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); - } - try { - fcall.sendResponse(fb,msg,msgType,seqid); - } catch (java.lang.Exception ex) { - _LOGGER.error("Exception writing to internal frame buffer", ex); - fb.close(); - } - } - }; - } - - protected boolean isOneway() { - return false; - } - - public void start(I iface, getAPIVersion_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.getAPIVersion(args.authzToken,resultHandler); - } - } - public static class addGateway extends org.apache.thrift.AsyncProcessFunction { public addGateway() { super("addGateway"); @@ -1461,940 +1280,6 @@ public class TenantProfileService { } - public static class getAPIVersion_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_args"); - - private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAPIVersion_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAPIVersion_argsTupleSchemeFactory(); - - public org.apache.airavata.model.security.AuthzToken authzToken; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - AUTHZ_TOKEN((short)1, "authzToken"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // AUTHZ_TOKEN - return AUTHZ_TOKEN; - 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 java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - public short getThriftFieldId() { - return _thriftId; - } - - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap); - } - - public getAPIVersion_args() { - } - - public getAPIVersion_args( - org.apache.airavata.model.security.AuthzToken authzToken) - { - this(); - this.authzToken = authzToken; - } - - /** - * Performs a deep copy on other. - */ - public getAPIVersion_args(getAPIVersion_args other) { - if (other.isSetAuthzToken()) { - this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken); - } - } - - public getAPIVersion_args deepCopy() { - return new getAPIVersion_args(this); - } - - @Override - public void clear() { - this.authzToken = null; - } - - public org.apache.airavata.model.security.AuthzToken getAuthzToken() { - return this.authzToken; - } - - public getAPIVersion_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) { - this.authzToken = authzToken; - return this; - } - - public void unsetAuthzToken() { - this.authzToken = null; - } - - /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */ - public boolean isSetAuthzToken() { - return this.authzToken != null; - } - - public void setAuthzTokenIsSet(boolean value) { - if (!value) { - this.authzToken = null; - } - } - - public void setFieldValue(_Fields field, java.lang.Object value) { - switch (field) { - case AUTHZ_TOKEN: - if (value == null) { - unsetAuthzToken(); - } else { - setAuthzToken((org.apache.airavata.model.security.AuthzToken)value); - } - break; - - } - } - - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case AUTHZ_TOKEN: - return getAuthzToken(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case AUTHZ_TOKEN: - return isSetAuthzToken(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that == null) - return false; - if (that instanceof getAPIVersion_args) - return this.equals((getAPIVersion_args)that); - return false; - } - - public boolean equals(getAPIVersion_args that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_authzToken = true && this.isSetAuthzToken(); - boolean that_present_authzToken = true && that.isSetAuthzToken(); - if (this_present_authzToken || that_present_authzToken) { - if (!(this_present_authzToken && that_present_authzToken)) - return false; - if (!this.authzToken.equals(that.authzToken)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetAuthzToken()) ? 131071 : 524287); - if (isSetAuthzToken()) - hashCode = hashCode * 8191 + authzToken.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(getAPIVersion_args other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAuthzToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken); - 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 { - scheme(iprot).read(iprot, this); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("getAPIVersion_args("); - boolean first = true; - - sb.append("authzToken:"); - if (this.authzToken == null) { - sb.append("null"); - } else { - sb.append(this.authzToken); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - if (authzToken == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString()); - } - // check for sub-struct validity - if (authzToken != null) { - authzToken.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, java.lang.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 getAPIVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_argsStandardScheme getScheme() { - return new getAPIVersion_argsStandardScheme(); - } - } - - private static class getAPIVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_args 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: // AUTHZ_TOKEN - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); - struct.authzToken.read(iprot); - struct.setAuthzTokenIsSet(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(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_args struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.authzToken != null) { - oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC); - struct.authzToken.write(oprot); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class getAPIVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_argsTupleScheme getScheme() { - return new getAPIVersion_argsTupleScheme(); - } - } - - private static class getAPIVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - struct.authzToken.write(oprot); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - struct.authzToken = new org.apache.airavata.model.security.AuthzToken(); - struct.authzToken.read(iprot); - struct.setAuthzTokenIsSet(true); - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - } - - public static class getAPIVersion_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_result"); - - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField AE_FIELD_DESC = new org.apache.thrift.protocol.TField("ae", org.apache.thrift.protocol.TType.STRUCT, (short)2); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAPIVersion_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAPIVersion_resultTupleSchemeFactory(); - - public java.lang.String success; // required - public org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException tpe; // required - public org.apache.airavata.model.error.AuthorizationException ae; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SUCCESS((short)0, "success"), - TPE((short)1, "tpe"), - AE((short)2, "ae"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 0: // SUCCESS - return SUCCESS; - case 1: // TPE - return TPE; - case 2: // AE - return AE; - 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 java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - public short getThriftFieldId() { - return _thriftId; - } - - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException.class))); - tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.error.AuthorizationException.class))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_result.class, metaDataMap); - } - - public getAPIVersion_result() { - } - - public getAPIVersion_result( - java.lang.String success, - org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException tpe, - org.apache.airavata.model.error.AuthorizationException ae) - { - this(); - this.success = success; - this.tpe = tpe; - this.ae = ae; - } - - /** - * Performs a deep copy on other. - */ - public getAPIVersion_result(getAPIVersion_result other) { - if (other.isSetSuccess()) { - this.success = other.success; - } - if (other.isSetTpe()) { - this.tpe = new org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException(other.tpe); - } - if (other.isSetAe()) { - this.ae = new org.apache.airavata.model.error.AuthorizationException(other.ae); - } - } - - public getAPIVersion_result deepCopy() { - return new getAPIVersion_result(this); - } - - @Override - public void clear() { - this.success = null; - this.tpe = null; - this.ae = null; - } - - public java.lang.String getSuccess() { - return this.success; - } - - public getAPIVersion_result setSuccess(java.lang.String success) { - this.success = success; - return this; - } - - public void unsetSuccess() { - this.success = null; - } - - /** Returns true if field success is set (has been assigned a value) and false otherwise */ - public boolean isSetSuccess() { - return this.success != null; - } - - public void setSuccessIsSet(boolean value) { - if (!value) { - this.success = null; - } - } - - public org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException getTpe() { - return this.tpe; - } - - public getAPIVersion_result setTpe(org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException tpe) { - this.tpe = tpe; - return this; - } - - public void unsetTpe() { - this.tpe = null; - } - - /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ - public boolean isSetTpe() { - return this.tpe != null; - } - - public void setTpeIsSet(boolean value) { - if (!value) { - this.tpe = null; - } - } - - public org.apache.airavata.model.error.AuthorizationException getAe() { - return this.ae; - } - - public getAPIVersion_result setAe(org.apache.airavata.model.error.AuthorizationException ae) { - this.ae = ae; - return this; - } - - public void unsetAe() { - this.ae = null; - } - - /** Returns true if field ae is set (has been assigned a value) and false otherwise */ - public boolean isSetAe() { - return this.ae != null; - } - - public void setAeIsSet(boolean value) { - if (!value) { - this.ae = null; - } - } - - public void setFieldValue(_Fields field, java.lang.Object value) { - switch (field) { - case SUCCESS: - if (value == null) { - unsetSuccess(); - } else { - setSuccess((java.lang.String)value); - } - break; - - case TPE: - if (value == null) { - unsetTpe(); - } else { - setTpe((org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException)value); - } - break; - - case AE: - if (value == null) { - unsetAe(); - } else { - setAe((org.apache.airavata.model.error.AuthorizationException)value); - } - break; - - } - } - - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case SUCCESS: - return getSuccess(); - - case TPE: - return getTpe(); - - case AE: - return getAe(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case SUCCESS: - return isSetSuccess(); - case TPE: - return isSetTpe(); - case AE: - return isSetAe(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that == null) - return false; - if (that instanceof getAPIVersion_result) - return this.equals((getAPIVersion_result)that); - return false; - } - - public boolean equals(getAPIVersion_result that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_success = true && this.isSetSuccess(); - boolean that_present_success = true && that.isSetSuccess(); - if (this_present_success || that_present_success) { - if (!(this_present_success && that_present_success)) - return false; - if (!this.success.equals(that.success)) - return false; - } - - boolean this_present_tpe = true && this.isSetTpe(); - boolean that_present_tpe = true && that.isSetTpe(); - if (this_present_tpe || that_present_tpe) { - if (!(this_present_tpe && that_present_tpe)) - return false; - if (!this.tpe.equals(that.tpe)) - return false; - } - - boolean this_present_ae = true && this.isSetAe(); - boolean that_present_ae = true && that.isSetAe(); - if (this_present_ae || that_present_ae) { - if (!(this_present_ae && that_present_ae)) - return false; - if (!this.ae.equals(that.ae)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); - if (isSetSuccess()) - hashCode = hashCode * 8191 + success.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); - if (isSetTpe()) - hashCode = hashCode * 8191 + tpe.hashCode(); - - hashCode = hashCode * 8191 + ((isSetAe()) ? 131071 : 524287); - if (isSetAe()) - hashCode = hashCode * 8191 + ae.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(getAPIVersion_result other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.valueOf(isSetTpe()).compareTo(other.isSetTpe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTpe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.valueOf(isSetAe()).compareTo(other.isSetAe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ae, other.ae); - 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 { - scheme(iprot).read(iprot, this); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("getAPIVersion_result("); - boolean first = true; - - sb.append("success:"); - if (this.success == null) { - sb.append("null"); - } else { - sb.append(this.success); - } - first = false; - if (!first) sb.append(", "); - sb.append("tpe:"); - if (this.tpe == null) { - sb.append("null"); - } else { - sb.append(this.tpe); - } - first = false; - if (!first) sb.append(", "); - sb.append("ae:"); - if (this.ae == null) { - sb.append("null"); - } else { - sb.append(this.ae); - } - 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, java.lang.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 getAPIVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_resultStandardScheme getScheme() { - return new getAPIVersion_resultStandardScheme(); - } - } - - private static class getAPIVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_result 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 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.success = iprot.readString(); - struct.setSuccessIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 1: // TPE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tpe = new org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // AE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.ae = new org.apache.airavata.model.error.AuthorizationException(); - struct.ae.read(iprot); - struct.setAeIsSet(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(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_result struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.success != null) { - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - oprot.writeString(struct.success); - oprot.writeFieldEnd(); - } - if (struct.tpe != null) { - oprot.writeFieldBegin(TPE_FIELD_DESC); - struct.tpe.write(oprot); - oprot.writeFieldEnd(); - } - if (struct.ae != null) { - oprot.writeFieldBegin(AE_FIELD_DESC); - struct.ae.write(oprot); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class getAPIVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - public getAPIVersion_resultTupleScheme getScheme() { - return new getAPIVersion_resultTupleScheme(); - } - } - - private static class getAPIVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetSuccess()) { - optionals.set(0); - } - if (struct.isSetTpe()) { - optionals.set(1); - } - if (struct.isSetAe()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); - if (struct.isSetSuccess()) { - oprot.writeString(struct.success); - } - if (struct.isSetTpe()) { - struct.tpe.write(oprot); - } - if (struct.isSetAe()) { - struct.ae.write(oprot); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); - if (incoming.get(0)) { - struct.success = iprot.readString(); - struct.setSuccessIsSet(true); - } - if (incoming.get(1)) { - struct.tpe = new org.apache.airavata.service.profile.tenant.cpi.exception.TenantProfileServiceException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } - if (incoming.get(2)) { - struct.ae = new org.apache.airavata.model.error.AuthorizationException(); - struct.ae.read(iprot); - struct.setAeIsSet(true); - } - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - } - public static class addGateway_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addGateway_args"); diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/exception/TenantProfileServiceException.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/exception/TenantProfileServiceException.java index 2aed25c..f9a5e43 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/exception/TenantProfileServiceException.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/exception/TenantProfileServiceException.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/profile_tenant_cpiConstants.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/profile_tenant_cpiConstants.java index 005b59c..a4d647f 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/profile_tenant_cpiConstants.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/tenant/cpi/profile_tenant_cpiConstants.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -44,7 +25,7 @@ package org.apache.airavata.service.profile.tenant.cpi; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class profile_tenant_cpiConstants { - public static final java.lang.String TENANT_PROFILE_CPI_VERSION = "0.17"; + public static final java.lang.String TENANT_PROFILE_CPI_VERSION = "0.18.0"; public static final java.lang.String TENANT_PROFILE_CPI_NAME = "TenantProfileService"; diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java index b23d866..f1be679 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/UserProfileService.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -45,7 +26,7 @@ package org.apache.airavata.service.profile.user.cpi; @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class UserProfileService { - public interface Iface { + public interface Iface extends org.apache.airavata.base.api.BaseAPI.Iface { public java.lang.String addUserProfile(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.user.UserProfile userProfile) throws org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; @@ -61,7 +42,7 @@ public class UserProfileService { } - public interface AsyncIface { + public interface AsyncIface extends org.apache.airavata.base.api.BaseAPI .AsyncIface { public void addUserProfile(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.user.UserProfile userProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -77,7 +58,7 @@ public class UserProfileService { } - public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Client extends org.apache.airavata.base.api.BaseAPI.Client implements Iface { public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} public Client getClient(org.apache.thrift.protocol.TProtocol prot) { @@ -283,7 +264,7 @@ public class UserProfileService { } } - public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class AsyncClient extends org.apache.airavata.base.api.BaseAPI.AsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { private org.apache.thrift.async.TAsyncClientManager clientManager; private org.apache.thrift.protocol.TProtocolFactory protocolFactory; @@ -527,7 +508,7 @@ public class UserProfileService { } - public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { + public static class Processor extends org.apache.airavata.base.api.BaseAPI.Processor implements org.apache.thrift.TProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); @@ -708,7 +689,7 @@ public class UserProfileService { } - public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + public static class AsyncProcessor extends org.apache.airavata.base.api.BaseAPI.AsyncProcessor { private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { super(iface, getProcessMap(new java.util.HashMap>())); diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/exception/UserProfileServiceException.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/exception/UserProfileServiceException.java index 17e4785..be371b1 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/exception/UserProfileServiceException.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/exception/UserProfileServiceException.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/profile_user_cpiConstants.java b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/profile_user_cpiConstants.java index 02d0fd5..0c2418a 100644 --- a/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/profile_user_cpiConstants.java +++ b/airavata-services/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/user/cpi/profile_user_cpiConstants.java @@ -1,22 +1,3 @@ -/** - * - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -44,7 +25,7 @@ package org.apache.airavata.service.profile.user.cpi; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class profile_user_cpiConstants { - public static final java.lang.String USER_PROFILE_CPI_VERSION = "0.17"; + public static final java.lang.String USER_PROFILE_CPI_VERSION = "0.18.0"; public static final java.lang.String USER_PROFILE_CPI_NAME = "UserProfileService"; diff --git a/thrift-interface-descriptions/service-cpis/generate-service-cpi-stubs.sh b/thrift-interface-descriptions/service-cpis/generate-service-cpi-stubs.sh index 2d05376..10d23fe 100755 --- a/thrift-interface-descriptions/service-cpis/generate-service-cpi-stubs.sh +++ b/thrift-interface-descriptions/service-cpis/generate-service-cpi-stubs.sh @@ -75,6 +75,8 @@ setup() { PROFILE_SERVICE_THRIFT_FILE="${BASEDIR}/service-cpis/profile-service/profile-service-cpi.thrift" PROFILE_SERVICE_SRC_DIR='../../airavata-services/profile-service/profile-service-stubs/src/main/java' + BASE_API_SRC_DIR='../../airavata-api/airavata-base-api/src/main/java' + # Initialize the thrift arguments. # Since most of the Airavata API and Data Models have includes, use recursive option by default. # Generate all the files in target directory @@ -131,13 +133,20 @@ copy_changed_files() { # Read all the function arguments GENERATED_CODE_DIR=$1 WORKSPACE_SRC_DIR=$2 + IGNORE_GENERATED_CODE_PATH=$3 echo "Generated sources are in ${GENERATED_CODE_DIR}" echo "Destination workspace is in ${WORKSPACE_SRC_DIR}" # Check if the newly generated files exist in the targetted workspace, if not copy. Only changed files will be synced. # the extra slash to GENERATED_CODE_DIR is needed to ensure the parent directory itself is not copied. - rsync -auv ${GENERATED_CODE_DIR}/ ${WORKSPACE_SRC_DIR} + if [ -z "$3" ] + then + rsync -auv ${GENERATED_CODE_DIR}/ ${WORKSPACE_SRC_DIR} + else + echo "Ignoring generated path ${IGNORE_GENERATED_CODE_PATH}" + rsync -auv --exclude ${IGNORE_GENERATED_CODE_PATH} ${GENERATED_CODE_DIR}/ ${WORKSPACE_SRC_DIR} + fi } # The function generates the thrift stubs and copies to the specified directory. @@ -151,6 +160,8 @@ generate_thrift_stubs() { #Java generation directory JAVA_GEN_DIR=${BASE_TARGET_DIR}/gen-java + BASE_API_DIR=org/apache/airavata/base + # As a precaution remove and previously generated files if exists rm -rf ${JAVA_GEN_DIR} @@ -165,7 +176,11 @@ generate_thrift_stubs() { add_license_header $JAVA_GEN_DIR # Compare the newly generated classes with existing java generated skelton/stub sources and replace the changed ones. - copy_changed_files ${JAVA_GEN_DIR} ${COMPONENT_SRC_DIR} + copy_changed_files ${JAVA_GEN_DIR} ${COMPONENT_SRC_DIR} ${BASE_API_DIR} + + # This will copy the base API java stubs to airavata-base-api module + mkdir -p ${BASE_API_SRC_DIR}/org/apache/airavata/base + copy_changed_files ${JAVA_GEN_DIR}/org/apache/airavata/base ${BASE_API_SRC_DIR}/org/apache/airavata/base echo "Successfully generated new sources, compared against exiting code and replaced the changed files"