Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2D153200D02 for ; Fri, 4 Aug 2017 22:10:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2B7AD16E390; Fri, 4 Aug 2017 20:10:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 90E9716E36E for ; Fri, 4 Aug 2017 22:10:22 +0200 (CEST) Received: (qmail 93671 invoked by uid 500); 4 Aug 2017 20:10:21 -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 92912 invoked by uid 99); 4 Aug 2017 20:10:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2017 20:10:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55737F5EC8; Fri, 4 Aug 2017 20:10:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Fri, 04 Aug 2017 20:10:40 -0000 Message-Id: <692b8b8c4e9e42ddb3564840f56441cd@git.apache.org> In-Reply-To: <4e8f75634d3f43a2b7d8ebd1a483fed9@git.apache.org> References: <4e8f75634d3f43a2b7d8ebd1a483fed9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/51] [partial] airavata git commit: AIRAVATA-2505 Upgrade Airavata to Thrift 0.10.0 archived-at: Fri, 04 Aug 2017 20:10:25 -0000 http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java index f3f6042..3ddd318 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java @@ -16,41 +16,14 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.airavata.model.appcatalog.appdeployment; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) /** * Application Deployment Description * @@ -77,7 +50,7 @@ import org.slf4j.LoggerFactory; * assigns to the environment variable "NAME" the value * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class ApplicationDeploymentDescription implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription"); @@ -99,25 +72,22 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase private static final org.apache.thrift.protocol.TField DEFAULT_WALLTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultWalltime", org.apache.thrift.protocol.TType.I32, (short)16); private static final org.apache.thrift.protocol.TField EDITABLE_BY_USER_FIELD_DESC = new org.apache.thrift.protocol.TField("editableByUser", org.apache.thrift.protocol.TType.BOOL, (short)17); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ApplicationDeploymentDescriptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ApplicationDeploymentDescriptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ApplicationDeploymentDescriptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ApplicationDeploymentDescriptionTupleSchemeFactory(); - private String appDeploymentId; // required - private String appModuleId; // required - private String computeHostId; // required - private String executablePath; // required + private java.lang.String appDeploymentId; // required + private java.lang.String appModuleId; // required + private java.lang.String computeHostId; // required + private java.lang.String executablePath; // required private org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism; // required - private String appDeploymentDescription; // optional - private List moduleLoadCmds; // optional - private List libPrependPaths; // optional - private List libAppendPaths; // optional - private List setEnvironment; // optional - private List preJobCommands; // optional - private List postJobCommands; // optional - private String defaultQueueName; // optional + private java.lang.String appDeploymentDescription; // optional + private java.util.List moduleLoadCmds; // optional + private java.util.List libPrependPaths; // optional + private java.util.List libAppendPaths; // optional + private java.util.List setEnvironment; // optional + private java.util.List preJobCommands; // optional + private java.util.List postJobCommands; // optional + private java.lang.String defaultQueueName; // optional private int defaultNodeCount; // optional private int defaultCPUCount; // optional private int defaultWalltime; // optional @@ -147,10 +117,10 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase DEFAULT_WALLTIME((short)16, "defaultWalltime"), EDITABLE_BY_USER((short)17, "editableByUser"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -205,21 +175,21 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -228,7 +198,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -240,9 +210,9 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase private static final int __EDITABLEBYUSER_ISSET_ID = 3; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT,_Fields.PRE_JOB_COMMANDS,_Fields.POST_JOB_COMMANDS,_Fields.DEFAULT_QUEUE_NAME,_Fields.DEFAULT_NODE_COUNT,_Fields.DEFAULT_CPUCOUNT,_Fields.DEFAULT_WALLTIME,_Fields.EDITABLE_BY_USER}; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.APP_DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("appDeploymentId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.APP_MODULE_ID, new org.apache.thrift.meta_data.FieldMetaData("appModuleId", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -283,7 +253,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.EDITABLE_BY_USER, new org.apache.thrift.meta_data.FieldMetaData("editableByUser", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationDeploymentDescription.class, metaDataMap); } @@ -295,10 +265,10 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } public ApplicationDeploymentDescription( - String appDeploymentId, - String appModuleId, - String computeHostId, - String executablePath, + java.lang.String appDeploymentId, + java.lang.String appModuleId, + java.lang.String computeHostId, + java.lang.String executablePath, org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism) { this(); @@ -333,42 +303,42 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase this.appDeploymentDescription = other.appDeploymentDescription; } if (other.isSetModuleLoadCmds()) { - List __this__moduleLoadCmds = new ArrayList(other.moduleLoadCmds.size()); + java.util.List __this__moduleLoadCmds = new java.util.ArrayList(other.moduleLoadCmds.size()); for (CommandObject other_element : other.moduleLoadCmds) { __this__moduleLoadCmds.add(new CommandObject(other_element)); } this.moduleLoadCmds = __this__moduleLoadCmds; } if (other.isSetLibPrependPaths()) { - List __this__libPrependPaths = new ArrayList(other.libPrependPaths.size()); + java.util.List __this__libPrependPaths = new java.util.ArrayList(other.libPrependPaths.size()); for (SetEnvPaths other_element : other.libPrependPaths) { __this__libPrependPaths.add(new SetEnvPaths(other_element)); } this.libPrependPaths = __this__libPrependPaths; } if (other.isSetLibAppendPaths()) { - List __this__libAppendPaths = new ArrayList(other.libAppendPaths.size()); + java.util.List __this__libAppendPaths = new java.util.ArrayList(other.libAppendPaths.size()); for (SetEnvPaths other_element : other.libAppendPaths) { __this__libAppendPaths.add(new SetEnvPaths(other_element)); } this.libAppendPaths = __this__libAppendPaths; } if (other.isSetSetEnvironment()) { - List __this__setEnvironment = new ArrayList(other.setEnvironment.size()); + java.util.List __this__setEnvironment = new java.util.ArrayList(other.setEnvironment.size()); for (SetEnvPaths other_element : other.setEnvironment) { __this__setEnvironment.add(new SetEnvPaths(other_element)); } this.setEnvironment = __this__setEnvironment; } if (other.isSetPreJobCommands()) { - List __this__preJobCommands = new ArrayList(other.preJobCommands.size()); + java.util.List __this__preJobCommands = new java.util.ArrayList(other.preJobCommands.size()); for (CommandObject other_element : other.preJobCommands) { __this__preJobCommands.add(new CommandObject(other_element)); } this.preJobCommands = __this__preJobCommands; } if (other.isSetPostJobCommands()) { - List __this__postJobCommands = new ArrayList(other.postJobCommands.size()); + java.util.List __this__postJobCommands = new java.util.ArrayList(other.postJobCommands.size()); for (CommandObject other_element : other.postJobCommands) { __this__postJobCommands.add(new CommandObject(other_element)); } @@ -414,11 +384,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase this.editableByUser = false; } - public String getAppDeploymentId() { + public java.lang.String getAppDeploymentId() { return this.appDeploymentId; } - public void setAppDeploymentId(String appDeploymentId) { + public void setAppDeploymentId(java.lang.String appDeploymentId) { this.appDeploymentId = appDeploymentId; } @@ -437,11 +407,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - public String getAppModuleId() { + public java.lang.String getAppModuleId() { return this.appModuleId; } - public void setAppModuleId(String appModuleId) { + public void setAppModuleId(java.lang.String appModuleId) { this.appModuleId = appModuleId; } @@ -460,11 +430,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - public String getComputeHostId() { + public java.lang.String getComputeHostId() { return this.computeHostId; } - public void setComputeHostId(String computeHostId) { + public void setComputeHostId(java.lang.String computeHostId) { this.computeHostId = computeHostId; } @@ -483,11 +453,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - public String getExecutablePath() { + public java.lang.String getExecutablePath() { return this.executablePath; } - public void setExecutablePath(String executablePath) { + public void setExecutablePath(java.lang.String executablePath) { this.executablePath = executablePath; } @@ -537,11 +507,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - public String getAppDeploymentDescription() { + public java.lang.String getAppDeploymentDescription() { return this.appDeploymentDescription; } - public void setAppDeploymentDescription(String appDeploymentDescription) { + public void setAppDeploymentDescription(java.lang.String appDeploymentDescription) { this.appDeploymentDescription = appDeploymentDescription; } @@ -570,16 +540,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public void addToModuleLoadCmds(CommandObject elem) { if (this.moduleLoadCmds == null) { - this.moduleLoadCmds = new ArrayList(); + this.moduleLoadCmds = new java.util.ArrayList(); } this.moduleLoadCmds.add(elem); } - public List getModuleLoadCmds() { + public java.util.List getModuleLoadCmds() { return this.moduleLoadCmds; } - public void setModuleLoadCmds(List moduleLoadCmds) { + public void setModuleLoadCmds(java.util.List moduleLoadCmds) { this.moduleLoadCmds = moduleLoadCmds; } @@ -608,16 +578,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public void addToLibPrependPaths(SetEnvPaths elem) { if (this.libPrependPaths == null) { - this.libPrependPaths = new ArrayList(); + this.libPrependPaths = new java.util.ArrayList(); } this.libPrependPaths.add(elem); } - public List getLibPrependPaths() { + public java.util.List getLibPrependPaths() { return this.libPrependPaths; } - public void setLibPrependPaths(List libPrependPaths) { + public void setLibPrependPaths(java.util.List libPrependPaths) { this.libPrependPaths = libPrependPaths; } @@ -646,16 +616,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public void addToLibAppendPaths(SetEnvPaths elem) { if (this.libAppendPaths == null) { - this.libAppendPaths = new ArrayList(); + this.libAppendPaths = new java.util.ArrayList(); } this.libAppendPaths.add(elem); } - public List getLibAppendPaths() { + public java.util.List getLibAppendPaths() { return this.libAppendPaths; } - public void setLibAppendPaths(List libAppendPaths) { + public void setLibAppendPaths(java.util.List libAppendPaths) { this.libAppendPaths = libAppendPaths; } @@ -684,16 +654,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public void addToSetEnvironment(SetEnvPaths elem) { if (this.setEnvironment == null) { - this.setEnvironment = new ArrayList(); + this.setEnvironment = new java.util.ArrayList(); } this.setEnvironment.add(elem); } - public List getSetEnvironment() { + public java.util.List getSetEnvironment() { return this.setEnvironment; } - public void setSetEnvironment(List setEnvironment) { + public void setSetEnvironment(java.util.List setEnvironment) { this.setEnvironment = setEnvironment; } @@ -722,16 +692,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public void addToPreJobCommands(CommandObject elem) { if (this.preJobCommands == null) { - this.preJobCommands = new ArrayList(); + this.preJobCommands = new java.util.ArrayList(); } this.preJobCommands.add(elem); } - public List getPreJobCommands() { + public java.util.List getPreJobCommands() { return this.preJobCommands; } - public void setPreJobCommands(List preJobCommands) { + public void setPreJobCommands(java.util.List preJobCommands) { this.preJobCommands = preJobCommands; } @@ -760,16 +730,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public void addToPostJobCommands(CommandObject elem) { if (this.postJobCommands == null) { - this.postJobCommands = new ArrayList(); + this.postJobCommands = new java.util.ArrayList(); } this.postJobCommands.add(elem); } - public List getPostJobCommands() { + public java.util.List getPostJobCommands() { return this.postJobCommands; } - public void setPostJobCommands(List postJobCommands) { + public void setPostJobCommands(java.util.List postJobCommands) { this.postJobCommands = postJobCommands; } @@ -788,11 +758,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - public String getDefaultQueueName() { + public java.lang.String getDefaultQueueName() { return this.defaultQueueName; } - public void setDefaultQueueName(String defaultQueueName) { + public void setDefaultQueueName(java.lang.String defaultQueueName) { this.defaultQueueName = defaultQueueName; } @@ -821,16 +791,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } public void unsetDefaultNodeCount() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID); } /** Returns true if field defaultNodeCount is set (has been assigned a value) and false otherwise */ public boolean isSetDefaultNodeCount() { - return EncodingUtils.testBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID); } public void setDefaultNodeCountIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID, value); } public int getDefaultCPUCount() { @@ -843,16 +813,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } public void unsetDefaultCPUCount() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID); } /** Returns true if field defaultCPUCount is set (has been assigned a value) and false otherwise */ public boolean isSetDefaultCPUCount() { - return EncodingUtils.testBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID); } public void setDefaultCPUCountIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID, value); } public int getDefaultWalltime() { @@ -865,16 +835,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } public void unsetDefaultWalltime() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID); } /** Returns true if field defaultWalltime is set (has been assigned a value) and false otherwise */ public boolean isSetDefaultWalltime() { - return EncodingUtils.testBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID); } public void setDefaultWalltimeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID, value); } public boolean isEditableByUser() { @@ -887,25 +857,25 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } public void unsetEditableByUser() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EDITABLEBYUSER_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EDITABLEBYUSER_ISSET_ID); } /** Returns true if field editableByUser is set (has been assigned a value) and false otherwise */ public boolean isSetEditableByUser() { - return EncodingUtils.testBit(__isset_bitfield, __EDITABLEBYUSER_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EDITABLEBYUSER_ISSET_ID); } public void setEditableByUserIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EDITABLEBYUSER_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EDITABLEBYUSER_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case APP_DEPLOYMENT_ID: if (value == null) { unsetAppDeploymentId(); } else { - setAppDeploymentId((String)value); + setAppDeploymentId((java.lang.String)value); } break; @@ -913,7 +883,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetAppModuleId(); } else { - setAppModuleId((String)value); + setAppModuleId((java.lang.String)value); } break; @@ -921,7 +891,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetComputeHostId(); } else { - setComputeHostId((String)value); + setComputeHostId((java.lang.String)value); } break; @@ -929,7 +899,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetExecutablePath(); } else { - setExecutablePath((String)value); + setExecutablePath((java.lang.String)value); } break; @@ -945,7 +915,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetAppDeploymentDescription(); } else { - setAppDeploymentDescription((String)value); + setAppDeploymentDescription((java.lang.String)value); } break; @@ -953,7 +923,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetModuleLoadCmds(); } else { - setModuleLoadCmds((List)value); + setModuleLoadCmds((java.util.List)value); } break; @@ -961,7 +931,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetLibPrependPaths(); } else { - setLibPrependPaths((List)value); + setLibPrependPaths((java.util.List)value); } break; @@ -969,7 +939,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetLibAppendPaths(); } else { - setLibAppendPaths((List)value); + setLibAppendPaths((java.util.List)value); } break; @@ -977,7 +947,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetSetEnvironment(); } else { - setSetEnvironment((List)value); + setSetEnvironment((java.util.List)value); } break; @@ -985,7 +955,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetPreJobCommands(); } else { - setPreJobCommands((List)value); + setPreJobCommands((java.util.List)value); } break; @@ -993,7 +963,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetPostJobCommands(); } else { - setPostJobCommands((List)value); + setPostJobCommands((java.util.List)value); } break; @@ -1001,7 +971,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetDefaultQueueName(); } else { - setDefaultQueueName((String)value); + setDefaultQueueName((java.lang.String)value); } break; @@ -1009,7 +979,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetDefaultNodeCount(); } else { - setDefaultNodeCount((Integer)value); + setDefaultNodeCount((java.lang.Integer)value); } break; @@ -1017,7 +987,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetDefaultCPUCount(); } else { - setDefaultCPUCount((Integer)value); + setDefaultCPUCount((java.lang.Integer)value); } break; @@ -1025,7 +995,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetDefaultWalltime(); } else { - setDefaultWalltime((Integer)value); + setDefaultWalltime((java.lang.Integer)value); } break; @@ -1033,14 +1003,14 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetEditableByUser(); } else { - setEditableByUser((Boolean)value); + setEditableByUser((java.lang.Boolean)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case APP_DEPLOYMENT_ID: return getAppDeploymentId(); @@ -1094,13 +1064,13 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return isEditableByUser(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -1139,11 +1109,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase case EDITABLE_BY_USER: return isSetEditableByUser(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof ApplicationDeploymentDescription) @@ -1154,6 +1124,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public boolean equals(ApplicationDeploymentDescription that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_appDeploymentId = true && this.isSetAppDeploymentId(); boolean that_present_appDeploymentId = true && that.isSetAppDeploymentId(); @@ -1313,94 +1285,77 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase @Override public int hashCode() { - List list = new ArrayList(); - - boolean present_appDeploymentId = true && (isSetAppDeploymentId()); - list.add(present_appDeploymentId); - if (present_appDeploymentId) - list.add(appDeploymentId); - - boolean present_appModuleId = true && (isSetAppModuleId()); - list.add(present_appModuleId); - if (present_appModuleId) - list.add(appModuleId); - - boolean present_computeHostId = true && (isSetComputeHostId()); - list.add(present_computeHostId); - if (present_computeHostId) - list.add(computeHostId); - - boolean present_executablePath = true && (isSetExecutablePath()); - list.add(present_executablePath); - if (present_executablePath) - list.add(executablePath); - - boolean present_parallelism = true && (isSetParallelism()); - list.add(present_parallelism); - if (present_parallelism) - list.add(parallelism.getValue()); - - boolean present_appDeploymentDescription = true && (isSetAppDeploymentDescription()); - list.add(present_appDeploymentDescription); - if (present_appDeploymentDescription) - list.add(appDeploymentDescription); - - boolean present_moduleLoadCmds = true && (isSetModuleLoadCmds()); - list.add(present_moduleLoadCmds); - if (present_moduleLoadCmds) - list.add(moduleLoadCmds); - - boolean present_libPrependPaths = true && (isSetLibPrependPaths()); - list.add(present_libPrependPaths); - if (present_libPrependPaths) - list.add(libPrependPaths); - - boolean present_libAppendPaths = true && (isSetLibAppendPaths()); - list.add(present_libAppendPaths); - if (present_libAppendPaths) - list.add(libAppendPaths); - - boolean present_setEnvironment = true && (isSetSetEnvironment()); - list.add(present_setEnvironment); - if (present_setEnvironment) - list.add(setEnvironment); - - boolean present_preJobCommands = true && (isSetPreJobCommands()); - list.add(present_preJobCommands); - if (present_preJobCommands) - list.add(preJobCommands); - - boolean present_postJobCommands = true && (isSetPostJobCommands()); - list.add(present_postJobCommands); - if (present_postJobCommands) - list.add(postJobCommands); - - boolean present_defaultQueueName = true && (isSetDefaultQueueName()); - list.add(present_defaultQueueName); - if (present_defaultQueueName) - list.add(defaultQueueName); - - boolean present_defaultNodeCount = true && (isSetDefaultNodeCount()); - list.add(present_defaultNodeCount); - if (present_defaultNodeCount) - list.add(defaultNodeCount); - - boolean present_defaultCPUCount = true && (isSetDefaultCPUCount()); - list.add(present_defaultCPUCount); - if (present_defaultCPUCount) - list.add(defaultCPUCount); - - boolean present_defaultWalltime = true && (isSetDefaultWalltime()); - list.add(present_defaultWalltime); - if (present_defaultWalltime) - list.add(defaultWalltime); - - boolean present_editableByUser = true && (isSetEditableByUser()); - list.add(present_editableByUser); - if (present_editableByUser) - list.add(editableByUser); - - return list.hashCode(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((isSetAppDeploymentId()) ? 131071 : 524287); + if (isSetAppDeploymentId()) + hashCode = hashCode * 8191 + appDeploymentId.hashCode(); + + hashCode = hashCode * 8191 + ((isSetAppModuleId()) ? 131071 : 524287); + if (isSetAppModuleId()) + hashCode = hashCode * 8191 + appModuleId.hashCode(); + + hashCode = hashCode * 8191 + ((isSetComputeHostId()) ? 131071 : 524287); + if (isSetComputeHostId()) + hashCode = hashCode * 8191 + computeHostId.hashCode(); + + hashCode = hashCode * 8191 + ((isSetExecutablePath()) ? 131071 : 524287); + if (isSetExecutablePath()) + hashCode = hashCode * 8191 + executablePath.hashCode(); + + hashCode = hashCode * 8191 + ((isSetParallelism()) ? 131071 : 524287); + if (isSetParallelism()) + hashCode = hashCode * 8191 + parallelism.getValue(); + + hashCode = hashCode * 8191 + ((isSetAppDeploymentDescription()) ? 131071 : 524287); + if (isSetAppDeploymentDescription()) + hashCode = hashCode * 8191 + appDeploymentDescription.hashCode(); + + hashCode = hashCode * 8191 + ((isSetModuleLoadCmds()) ? 131071 : 524287); + if (isSetModuleLoadCmds()) + hashCode = hashCode * 8191 + moduleLoadCmds.hashCode(); + + hashCode = hashCode * 8191 + ((isSetLibPrependPaths()) ? 131071 : 524287); + if (isSetLibPrependPaths()) + hashCode = hashCode * 8191 + libPrependPaths.hashCode(); + + hashCode = hashCode * 8191 + ((isSetLibAppendPaths()) ? 131071 : 524287); + if (isSetLibAppendPaths()) + hashCode = hashCode * 8191 + libAppendPaths.hashCode(); + + hashCode = hashCode * 8191 + ((isSetSetEnvironment()) ? 131071 : 524287); + if (isSetSetEnvironment()) + hashCode = hashCode * 8191 + setEnvironment.hashCode(); + + hashCode = hashCode * 8191 + ((isSetPreJobCommands()) ? 131071 : 524287); + if (isSetPreJobCommands()) + hashCode = hashCode * 8191 + preJobCommands.hashCode(); + + hashCode = hashCode * 8191 + ((isSetPostJobCommands()) ? 131071 : 524287); + if (isSetPostJobCommands()) + hashCode = hashCode * 8191 + postJobCommands.hashCode(); + + hashCode = hashCode * 8191 + ((isSetDefaultQueueName()) ? 131071 : 524287); + if (isSetDefaultQueueName()) + hashCode = hashCode * 8191 + defaultQueueName.hashCode(); + + hashCode = hashCode * 8191 + ((isSetDefaultNodeCount()) ? 131071 : 524287); + if (isSetDefaultNodeCount()) + hashCode = hashCode * 8191 + defaultNodeCount; + + hashCode = hashCode * 8191 + ((isSetDefaultCPUCount()) ? 131071 : 524287); + if (isSetDefaultCPUCount()) + hashCode = hashCode * 8191 + defaultCPUCount; + + hashCode = hashCode * 8191 + ((isSetDefaultWalltime()) ? 131071 : 524287); + if (isSetDefaultWalltime()) + hashCode = hashCode * 8191 + defaultWalltime; + + hashCode = hashCode * 8191 + ((isSetEditableByUser()) ? 131071 : 524287); + if (isSetEditableByUser()) + hashCode = hashCode * 8191 + ((editableByUser) ? 131071 : 524287); + + return hashCode; } @Override @@ -1411,7 +1366,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetAppDeploymentId()).compareTo(other.isSetAppDeploymentId()); + lastComparison = java.lang.Boolean.valueOf(isSetAppDeploymentId()).compareTo(other.isSetAppDeploymentId()); if (lastComparison != 0) { return lastComparison; } @@ -1421,7 +1376,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAppModuleId()).compareTo(other.isSetAppModuleId()); + lastComparison = java.lang.Boolean.valueOf(isSetAppModuleId()).compareTo(other.isSetAppModuleId()); if (lastComparison != 0) { return lastComparison; } @@ -1431,7 +1386,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetComputeHostId()).compareTo(other.isSetComputeHostId()); + lastComparison = java.lang.Boolean.valueOf(isSetComputeHostId()).compareTo(other.isSetComputeHostId()); if (lastComparison != 0) { return lastComparison; } @@ -1441,7 +1396,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetExecutablePath()).compareTo(other.isSetExecutablePath()); + lastComparison = java.lang.Boolean.valueOf(isSetExecutablePath()).compareTo(other.isSetExecutablePath()); if (lastComparison != 0) { return lastComparison; } @@ -1451,7 +1406,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetParallelism()).compareTo(other.isSetParallelism()); + lastComparison = java.lang.Boolean.valueOf(isSetParallelism()).compareTo(other.isSetParallelism()); if (lastComparison != 0) { return lastComparison; } @@ -1461,7 +1416,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAppDeploymentDescription()).compareTo(other.isSetAppDeploymentDescription()); + lastComparison = java.lang.Boolean.valueOf(isSetAppDeploymentDescription()).compareTo(other.isSetAppDeploymentDescription()); if (lastComparison != 0) { return lastComparison; } @@ -1471,7 +1426,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetModuleLoadCmds()).compareTo(other.isSetModuleLoadCmds()); + lastComparison = java.lang.Boolean.valueOf(isSetModuleLoadCmds()).compareTo(other.isSetModuleLoadCmds()); if (lastComparison != 0) { return lastComparison; } @@ -1481,7 +1436,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLibPrependPaths()).compareTo(other.isSetLibPrependPaths()); + lastComparison = java.lang.Boolean.valueOf(isSetLibPrependPaths()).compareTo(other.isSetLibPrependPaths()); if (lastComparison != 0) { return lastComparison; } @@ -1491,7 +1446,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLibAppendPaths()).compareTo(other.isSetLibAppendPaths()); + lastComparison = java.lang.Boolean.valueOf(isSetLibAppendPaths()).compareTo(other.isSetLibAppendPaths()); if (lastComparison != 0) { return lastComparison; } @@ -1501,7 +1456,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSetEnvironment()).compareTo(other.isSetSetEnvironment()); + lastComparison = java.lang.Boolean.valueOf(isSetSetEnvironment()).compareTo(other.isSetSetEnvironment()); if (lastComparison != 0) { return lastComparison; } @@ -1511,7 +1466,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPreJobCommands()).compareTo(other.isSetPreJobCommands()); + lastComparison = java.lang.Boolean.valueOf(isSetPreJobCommands()).compareTo(other.isSetPreJobCommands()); if (lastComparison != 0) { return lastComparison; } @@ -1521,7 +1476,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPostJobCommands()).compareTo(other.isSetPostJobCommands()); + lastComparison = java.lang.Boolean.valueOf(isSetPostJobCommands()).compareTo(other.isSetPostJobCommands()); if (lastComparison != 0) { return lastComparison; } @@ -1531,7 +1486,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDefaultQueueName()).compareTo(other.isSetDefaultQueueName()); + lastComparison = java.lang.Boolean.valueOf(isSetDefaultQueueName()).compareTo(other.isSetDefaultQueueName()); if (lastComparison != 0) { return lastComparison; } @@ -1541,7 +1496,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDefaultNodeCount()).compareTo(other.isSetDefaultNodeCount()); + lastComparison = java.lang.Boolean.valueOf(isSetDefaultNodeCount()).compareTo(other.isSetDefaultNodeCount()); if (lastComparison != 0) { return lastComparison; } @@ -1551,7 +1506,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDefaultCPUCount()).compareTo(other.isSetDefaultCPUCount()); + lastComparison = java.lang.Boolean.valueOf(isSetDefaultCPUCount()).compareTo(other.isSetDefaultCPUCount()); if (lastComparison != 0) { return lastComparison; } @@ -1561,7 +1516,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDefaultWalltime()).compareTo(other.isSetDefaultWalltime()); + lastComparison = java.lang.Boolean.valueOf(isSetDefaultWalltime()).compareTo(other.isSetDefaultWalltime()); if (lastComparison != 0) { return lastComparison; } @@ -1571,7 +1526,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEditableByUser()).compareTo(other.isSetEditableByUser()); + lastComparison = java.lang.Boolean.valueOf(isSetEditableByUser()).compareTo(other.isSetEditableByUser()); if (lastComparison != 0) { return lastComparison; } @@ -1589,16 +1544,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + scheme(iprot).read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("ApplicationDeploymentDescription("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ApplicationDeploymentDescription("); boolean first = true; sb.append("appDeploymentId:"); @@ -1781,7 +1736,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; @@ -1791,13 +1746,13 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } - private static class ApplicationDeploymentDescriptionStandardSchemeFactory implements SchemeFactory { + private static class ApplicationDeploymentDescriptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ApplicationDeploymentDescriptionStandardScheme getScheme() { return new ApplicationDeploymentDescriptionStandardScheme(); } } - private static class ApplicationDeploymentDescriptionStandardScheme extends StandardScheme { + private static class ApplicationDeploymentDescriptionStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1861,7 +1816,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.moduleLoadCmds = new ArrayList(_list0.size); + struct.moduleLoadCmds = new java.util.ArrayList(_list0.size); CommandObject _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { @@ -1880,7 +1835,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); - struct.libPrependPaths = new ArrayList(_list3.size); + struct.libPrependPaths = new java.util.ArrayList(_list3.size); SetEnvPaths _elem4; for (int _i5 = 0; _i5 < _list3.size; ++_i5) { @@ -1899,7 +1854,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list6 = iprot.readListBegin(); - struct.libAppendPaths = new ArrayList(_list6.size); + struct.libAppendPaths = new java.util.ArrayList(_list6.size); SetEnvPaths _elem7; for (int _i8 = 0; _i8 < _list6.size; ++_i8) { @@ -1918,7 +1873,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list9 = iprot.readListBegin(); - struct.setEnvironment = new ArrayList(_list9.size); + struct.setEnvironment = new java.util.ArrayList(_list9.size); SetEnvPaths _elem10; for (int _i11 = 0; _i11 < _list9.size; ++_i11) { @@ -1937,7 +1892,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list12 = iprot.readListBegin(); - struct.preJobCommands = new ArrayList(_list12.size); + struct.preJobCommands = new java.util.ArrayList(_list12.size); CommandObject _elem13; for (int _i14 = 0; _i14 < _list12.size; ++_i14) { @@ -1956,7 +1911,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list15 = iprot.readListBegin(); - struct.postJobCommands = new ArrayList(_list15.size); + struct.postJobCommands = new java.util.ArrayList(_list15.size); CommandObject _elem16; for (int _i17 = 0; _i17 < _list15.size; ++_i17) { @@ -2173,23 +2128,23 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } - private static class ApplicationDeploymentDescriptionTupleSchemeFactory implements SchemeFactory { + private static class ApplicationDeploymentDescriptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ApplicationDeploymentDescriptionTupleScheme getScheme() { return new ApplicationDeploymentDescriptionTupleScheme(); } } - private static class ApplicationDeploymentDescriptionTupleScheme extends TupleScheme { + private static class ApplicationDeploymentDescriptionTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; oprot.writeString(struct.appDeploymentId); oprot.writeString(struct.appModuleId); oprot.writeString(struct.computeHostId); oprot.writeString(struct.executablePath); oprot.writeI32(struct.parallelism.getValue()); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetAppDeploymentDescription()) { optionals.set(0); } @@ -2303,7 +2258,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase @Override public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.appDeploymentId = iprot.readString(); struct.setAppDeploymentIdIsSet(true); struct.appModuleId = iprot.readString(); @@ -2314,7 +2269,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase struct.setExecutablePathIsSet(true); struct.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); struct.setParallelismIsSet(true); - BitSet incoming = iprot.readBitSet(12); + java.util.BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.appDeploymentDescription = iprot.readString(); struct.setAppDeploymentDescriptionIsSet(true); @@ -2322,7 +2277,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (incoming.get(1)) { { org.apache.thrift.protocol.TList _list30 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.moduleLoadCmds = new ArrayList(_list30.size); + struct.moduleLoadCmds = new java.util.ArrayList(_list30.size); CommandObject _elem31; for (int _i32 = 0; _i32 < _list30.size; ++_i32) { @@ -2336,7 +2291,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (incoming.get(2)) { { org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.libPrependPaths = new ArrayList(_list33.size); + struct.libPrependPaths = new java.util.ArrayList(_list33.size); SetEnvPaths _elem34; for (int _i35 = 0; _i35 < _list33.size; ++_i35) { @@ -2350,7 +2305,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (incoming.get(3)) { { org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.libAppendPaths = new ArrayList(_list36.size); + struct.libAppendPaths = new java.util.ArrayList(_list36.size); SetEnvPaths _elem37; for (int _i38 = 0; _i38 < _list36.size; ++_i38) { @@ -2364,7 +2319,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (incoming.get(4)) { { org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.setEnvironment = new ArrayList(_list39.size); + struct.setEnvironment = new java.util.ArrayList(_list39.size); SetEnvPaths _elem40; for (int _i41 = 0; _i41 < _list39.size; ++_i41) { @@ -2378,7 +2333,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (incoming.get(5)) { { org.apache.thrift.protocol.TList _list42 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.preJobCommands = new ArrayList(_list42.size); + struct.preJobCommands = new java.util.ArrayList(_list42.size); CommandObject _elem43; for (int _i44 = 0; _i44 < _list42.size; ++_i44) { @@ -2392,7 +2347,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (incoming.get(6)) { { org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.postJobCommands = new ArrayList(_list45.size); + struct.postJobCommands = new java.util.ArrayList(_list45.size); CommandObject _elem46; for (int _i47 = 0; _i47 < _list45.size; ++_i47) { @@ -2426,5 +2381,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase } } + 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(); + } } http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java index f574e9a..746df51 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java @@ -16,41 +16,14 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.airavata.model.appcatalog.appdeployment; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) /** * Application Module Information. A module has to be registered before registering a deployment. * @@ -66,7 +39,7 @@ import org.slf4j.LoggerFactory; * Descriprion of the Module * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") public class ApplicationModule 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("ApplicationModule"); @@ -75,16 +48,13 @@ public class ApplicationModule implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ApplicationModuleStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ApplicationModuleTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ApplicationModuleStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ApplicationModuleTupleSchemeFactory(); - private String appModuleId; // required - private String appModuleName; // required - private String appModuleVersion; // optional - private String appModuleDescription; // optional + private java.lang.String appModuleId; // required + private java.lang.String appModuleName; // required + private java.lang.String appModuleVersion; // optional + private java.lang.String appModuleDescription; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -93,10 +63,10 @@ public class ApplicationModule implements org.apache.thrift.TBase byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -125,21 +95,21 @@ public class ApplicationModule implements org.apache.thrift.TBase metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.APP_MODULE_ID, new org.apache.thrift.meta_data.FieldMetaData("appModuleId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.APP_MODULE_NAME, new org.apache.thrift.meta_data.FieldMetaData("appModuleName", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -166,7 +136,7 @@ public class ApplicationModule implements org.apache.thrift.TBase list = new ArrayList(); + int hashCode = 1; - boolean present_appModuleId = true && (isSetAppModuleId()); - list.add(present_appModuleId); - if (present_appModuleId) - list.add(appModuleId); + hashCode = hashCode * 8191 + ((isSetAppModuleId()) ? 131071 : 524287); + if (isSetAppModuleId()) + hashCode = hashCode * 8191 + appModuleId.hashCode(); - boolean present_appModuleName = true && (isSetAppModuleName()); - list.add(present_appModuleName); - if (present_appModuleName) - list.add(appModuleName); + hashCode = hashCode * 8191 + ((isSetAppModuleName()) ? 131071 : 524287); + if (isSetAppModuleName()) + hashCode = hashCode * 8191 + appModuleName.hashCode(); - boolean present_appModuleVersion = true && (isSetAppModuleVersion()); - list.add(present_appModuleVersion); - if (present_appModuleVersion) - list.add(appModuleVersion); + hashCode = hashCode * 8191 + ((isSetAppModuleVersion()) ? 131071 : 524287); + if (isSetAppModuleVersion()) + hashCode = hashCode * 8191 + appModuleVersion.hashCode(); - boolean present_appModuleDescription = true && (isSetAppModuleDescription()); - list.add(present_appModuleDescription); - if (present_appModuleDescription) - list.add(appModuleDescription); + hashCode = hashCode * 8191 + ((isSetAppModuleDescription()) ? 131071 : 524287); + if (isSetAppModuleDescription()) + hashCode = hashCode * 8191 + appModuleDescription.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -468,7 +436,7 @@ public class ApplicationModule implements org.apache.thrift.TBase { + private static class ApplicationModuleStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationModule struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -689,20 +657,20 @@ public class ApplicationModule implements org.apache.thrift.TBase { + private static class ApplicationModuleTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationModule struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; oprot.writeString(struct.appModuleId); oprot.writeString(struct.appModuleName); - BitSet optionals = new BitSet(); + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetAppModuleVersion()) { optionals.set(0); } @@ -720,12 +688,12 @@ public class ApplicationModule implements org.apache.thrift.TBase 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(); + } }