diff options
author | Simon Rettberg | 2019-02-26 18:10:47 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-26 18:10:47 +0100 |
commit | b9d58c09588d58e4c4e6fb93fcc3db75e70805fa (patch) | |
tree | a6dfc67d589c80bc63bc1a0b468f34e27c0b57d9 | |
parent | Add Server Side Copy setting to SatelliteConfig (diff) | |
download | master-sync-shared-b9d58c0.tar.gz master-sync-shared-b9d58c0.tar.xz master-sync-shared-b9d58c0.zip |
Add predefined firewall rulesets
6 files changed, 1657 insertions, 517 deletions
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java index b2a183f..be1aa0c 100644 --- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java +++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-11") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25") public class LectureRead implements org.apache.thrift.TBase<LectureRead, LectureRead._Fields>, java.io.Serializable, Cloneable, Comparable<LectureRead> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureRead"); @@ -66,10 +66,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture private static final org.apache.thrift.protocol.TField LIMIT_TO_ALLOWED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("limitToAllowedUsers", org.apache.thrift.protocol.TType.BOOL, (short)27); private static final org.apache.thrift.protocol.TField HAS_USB_ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("hasUsbAccess", org.apache.thrift.protocol.TType.BOOL, (short)28); private static final org.apache.thrift.protocol.TField NETWORK_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("networkShares", org.apache.thrift.protocol.TType.LIST, (short)29); - private static final org.apache.thrift.protocol.TField PRESET_NETWORK_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkShares", org.apache.thrift.protocol.TType.LIST, (short)32); private static final org.apache.thrift.protocol.TField LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("ldapFilters", org.apache.thrift.protocol.TType.LIST, (short)30); - private static final org.apache.thrift.protocol.TField PRESET_LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetLdapFilters", org.apache.thrift.protocol.TType.LIST, (short)33); private static final org.apache.thrift.protocol.TField PRESET_SCRIPT_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetScriptIds", org.apache.thrift.protocol.TType.LIST, (short)31); + private static final org.apache.thrift.protocol.TField PRESET_NETWORK_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkShares", org.apache.thrift.protocol.TType.LIST, (short)32); + private static final org.apache.thrift.protocol.TField PRESET_LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetLdapFilters", org.apache.thrift.protocol.TType.LIST, (short)33); + private static final org.apache.thrift.protocol.TField PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkExceptionIds", org.apache.thrift.protocol.TType.LIST, (short)34); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -105,10 +106,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture public boolean limitToAllowedUsers; // required public boolean hasUsbAccess; // required public List<NetShare> networkShares; // optional - public List<Integer> presetNetworkShares; // optional public List<LdapFilter> ldapFilters; // optional - public List<Integer> presetLdapFilters; // optional public List<Integer> presetScriptIds; // optional + public List<Integer> presetNetworkShares; // optional + public List<Integer> presetLdapFilters; // optional + public List<Integer> presetNetworkExceptionIds; // 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 { @@ -140,10 +142,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture LIMIT_TO_ALLOWED_USERS((short)27, "limitToAllowedUsers"), HAS_USB_ACCESS((short)28, "hasUsbAccess"), NETWORK_SHARES((short)29, "networkShares"), - PRESET_NETWORK_SHARES((short)32, "presetNetworkShares"), LDAP_FILTERS((short)30, "ldapFilters"), + PRESET_SCRIPT_IDS((short)31, "presetScriptIds"), + PRESET_NETWORK_SHARES((short)32, "presetNetworkShares"), PRESET_LDAP_FILTERS((short)33, "presetLdapFilters"), - PRESET_SCRIPT_IDS((short)31, "presetScriptIds"); + PRESET_NETWORK_EXCEPTION_IDS((short)34, "presetNetworkExceptionIds"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -214,14 +217,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return HAS_USB_ACCESS; case 29: // NETWORK_SHARES return NETWORK_SHARES; - case 32: // PRESET_NETWORK_SHARES - return PRESET_NETWORK_SHARES; case 30: // LDAP_FILTERS return LDAP_FILTERS; - case 33: // PRESET_LDAP_FILTERS - return PRESET_LDAP_FILTERS; case 31: // PRESET_SCRIPT_IDS return PRESET_SCRIPT_IDS; + case 32: // PRESET_NETWORK_SHARES + return PRESET_NETWORK_SHARES; + case 33: // PRESET_LDAP_FILTERS + return PRESET_LDAP_FILTERS; + case 34: // PRESET_NETWORK_EXCEPTION_IDS + return PRESET_NETWORK_EXCEPTION_IDS; default: return null; } @@ -276,7 +281,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture private static final int __LIMITTOALLOWEDUSERS_ISSET_ID = 11; private static final int __HASUSBACCESS_ISSET_ID = 12; private short __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.NETWORK_SHARES,_Fields.PRESET_NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS}; + private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS,_Fields.PRESET_NETWORK_SHARES,_Fields.PRESET_LDAP_FILTERS,_Fields.PRESET_NETWORK_EXCEPTION_IDS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -341,16 +346,19 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture tmpMap.put(_Fields.NETWORK_SHARES, new org.apache.thrift.meta_data.FieldMetaData("networkShares", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NetShare.class)))); - tmpMap.put(_Fields.PRESET_NETWORK_SHARES, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkShares", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); tmpMap.put(_Fields.LDAP_FILTERS, new org.apache.thrift.meta_data.FieldMetaData("ldapFilters", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LdapFilter.class)))); + tmpMap.put(_Fields.PRESET_SCRIPT_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetScriptIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); + tmpMap.put(_Fields.PRESET_NETWORK_SHARES, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkShares", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); tmpMap.put(_Fields.PRESET_LDAP_FILTERS, new org.apache.thrift.meta_data.FieldMetaData("presetLdapFilters", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); - tmpMap.put(_Fields.PRESET_SCRIPT_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetScriptIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.PRESET_NETWORK_EXCEPTION_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkExceptionIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -504,10 +512,6 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } this.networkShares = __this__networkShares; } - if (other.isSetPresetNetworkShares()) { - List<Integer> __this__presetNetworkShares = new ArrayList<Integer>(other.presetNetworkShares); - this.presetNetworkShares = __this__presetNetworkShares; - } if (other.isSetLdapFilters()) { List<LdapFilter> __this__ldapFilters = new ArrayList<LdapFilter>(other.ldapFilters.size()); for (LdapFilter other_element : other.ldapFilters) { @@ -515,13 +519,21 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } this.ldapFilters = __this__ldapFilters; } + if (other.isSetPresetScriptIds()) { + List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds); + this.presetScriptIds = __this__presetScriptIds; + } + if (other.isSetPresetNetworkShares()) { + List<Integer> __this__presetNetworkShares = new ArrayList<Integer>(other.presetNetworkShares); + this.presetNetworkShares = __this__presetNetworkShares; + } if (other.isSetPresetLdapFilters()) { List<Integer> __this__presetLdapFilters = new ArrayList<Integer>(other.presetLdapFilters); this.presetLdapFilters = __this__presetLdapFilters; } - if (other.isSetPresetScriptIds()) { - List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds); - this.presetScriptIds = __this__presetScriptIds; + if (other.isSetPresetNetworkExceptionIds()) { + List<Integer> __this__presetNetworkExceptionIds = new ArrayList<Integer>(other.presetNetworkExceptionIds); + this.presetNetworkExceptionIds = __this__presetNetworkExceptionIds; } } @@ -572,10 +584,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture setHasUsbAccessIsSet(false); this.hasUsbAccess = false; this.networkShares = null; - this.presetNetworkShares = null; this.ldapFilters = null; - this.presetLdapFilters = null; this.presetScriptIds = null; + this.presetNetworkShares = null; + this.presetLdapFilters = null; + this.presetNetworkExceptionIds = null; } public String getLectureId() { @@ -1312,81 +1325,120 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } } - public int getPresetNetworkSharesSize() { - return (this.presetNetworkShares == null) ? 0 : this.presetNetworkShares.size(); + public int getLdapFiltersSize() { + return (this.ldapFilters == null) ? 0 : this.ldapFilters.size(); } - public java.util.Iterator<Integer> getPresetNetworkSharesIterator() { - return (this.presetNetworkShares == null) ? null : this.presetNetworkShares.iterator(); + public java.util.Iterator<LdapFilter> getLdapFiltersIterator() { + return (this.ldapFilters == null) ? null : this.ldapFilters.iterator(); } - public void addToPresetNetworkShares(int elem) { - if (this.presetNetworkShares == null) { - this.presetNetworkShares = new ArrayList<Integer>(); + public void addToLdapFilters(LdapFilter elem) { + if (this.ldapFilters == null) { + this.ldapFilters = new ArrayList<LdapFilter>(); } - this.presetNetworkShares.add(elem); + this.ldapFilters.add(elem); } - public List<Integer> getPresetNetworkShares() { - return this.presetNetworkShares; + public List<LdapFilter> getLdapFilters() { + return this.ldapFilters; } - public LectureRead setPresetNetworkShares(List<Integer> presetNetworkShares) { - this.presetNetworkShares = presetNetworkShares; + public LectureRead setLdapFilters(List<LdapFilter> ldapFilters) { + this.ldapFilters = ldapFilters; return this; } - public void unsetPresetNetworkShares() { - this.presetNetworkShares = null; + public void unsetLdapFilters() { + this.ldapFilters = null; } - /** Returns true if field presetNetworkShares is set (has been assigned a value) and false otherwise */ - public boolean isSetPresetNetworkShares() { - return this.presetNetworkShares != null; + /** Returns true if field ldapFilters is set (has been assigned a value) and false otherwise */ + public boolean isSetLdapFilters() { + return this.ldapFilters != null; } - public void setPresetNetworkSharesIsSet(boolean value) { + public void setLdapFiltersIsSet(boolean value) { if (!value) { - this.presetNetworkShares = null; + this.ldapFilters = null; } } - public int getLdapFiltersSize() { - return (this.ldapFilters == null) ? 0 : this.ldapFilters.size(); + public int getPresetScriptIdsSize() { + return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size(); } - public java.util.Iterator<LdapFilter> getLdapFiltersIterator() { - return (this.ldapFilters == null) ? null : this.ldapFilters.iterator(); + public java.util.Iterator<Integer> getPresetScriptIdsIterator() { + return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator(); } - public void addToLdapFilters(LdapFilter elem) { - if (this.ldapFilters == null) { - this.ldapFilters = new ArrayList<LdapFilter>(); + public void addToPresetScriptIds(int elem) { + if (this.presetScriptIds == null) { + this.presetScriptIds = new ArrayList<Integer>(); } - this.ldapFilters.add(elem); + this.presetScriptIds.add(elem); } - public List<LdapFilter> getLdapFilters() { - return this.ldapFilters; + public List<Integer> getPresetScriptIds() { + return this.presetScriptIds; } - public LectureRead setLdapFilters(List<LdapFilter> ldapFilters) { - this.ldapFilters = ldapFilters; + public LectureRead setPresetScriptIds(List<Integer> presetScriptIds) { + this.presetScriptIds = presetScriptIds; return this; } - public void unsetLdapFilters() { - this.ldapFilters = null; + public void unsetPresetScriptIds() { + this.presetScriptIds = null; } - /** Returns true if field ldapFilters is set (has been assigned a value) and false otherwise */ - public boolean isSetLdapFilters() { - return this.ldapFilters != null; + /** Returns true if field presetScriptIds is set (has been assigned a value) and false otherwise */ + public boolean isSetPresetScriptIds() { + return this.presetScriptIds != null; } - public void setLdapFiltersIsSet(boolean value) { + public void setPresetScriptIdsIsSet(boolean value) { if (!value) { - this.ldapFilters = null; + this.presetScriptIds = null; + } + } + + public int getPresetNetworkSharesSize() { + return (this.presetNetworkShares == null) ? 0 : this.presetNetworkShares.size(); + } + + public java.util.Iterator<Integer> getPresetNetworkSharesIterator() { + return (this.presetNetworkShares == null) ? null : this.presetNetworkShares.iterator(); + } + + public void addToPresetNetworkShares(int elem) { + if (this.presetNetworkShares == null) { + this.presetNetworkShares = new ArrayList<Integer>(); + } + this.presetNetworkShares.add(elem); + } + + public List<Integer> getPresetNetworkShares() { + return this.presetNetworkShares; + } + + public LectureRead setPresetNetworkShares(List<Integer> presetNetworkShares) { + this.presetNetworkShares = presetNetworkShares; + return this; + } + + public void unsetPresetNetworkShares() { + this.presetNetworkShares = null; + } + + /** Returns true if field presetNetworkShares is set (has been assigned a value) and false otherwise */ + public boolean isSetPresetNetworkShares() { + return this.presetNetworkShares != null; + } + + public void setPresetNetworkSharesIsSet(boolean value) { + if (!value) { + this.presetNetworkShares = null; } } @@ -1429,42 +1481,42 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } } - public int getPresetScriptIdsSize() { - return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size(); + public int getPresetNetworkExceptionIdsSize() { + return (this.presetNetworkExceptionIds == null) ? 0 : this.presetNetworkExceptionIds.size(); } - public java.util.Iterator<Integer> getPresetScriptIdsIterator() { - return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator(); + public java.util.Iterator<Integer> getPresetNetworkExceptionIdsIterator() { + return (this.presetNetworkExceptionIds == null) ? null : this.presetNetworkExceptionIds.iterator(); } - public void addToPresetScriptIds(int elem) { - if (this.presetScriptIds == null) { - this.presetScriptIds = new ArrayList<Integer>(); + public void addToPresetNetworkExceptionIds(int elem) { + if (this.presetNetworkExceptionIds == null) { + this.presetNetworkExceptionIds = new ArrayList<Integer>(); } - this.presetScriptIds.add(elem); + this.presetNetworkExceptionIds.add(elem); } - public List<Integer> getPresetScriptIds() { - return this.presetScriptIds; + public List<Integer> getPresetNetworkExceptionIds() { + return this.presetNetworkExceptionIds; } - public LectureRead setPresetScriptIds(List<Integer> presetScriptIds) { - this.presetScriptIds = presetScriptIds; + public LectureRead setPresetNetworkExceptionIds(List<Integer> presetNetworkExceptionIds) { + this.presetNetworkExceptionIds = presetNetworkExceptionIds; return this; } - public void unsetPresetScriptIds() { - this.presetScriptIds = null; + public void unsetPresetNetworkExceptionIds() { + this.presetNetworkExceptionIds = null; } - /** Returns true if field presetScriptIds is set (has been assigned a value) and false otherwise */ - public boolean isSetPresetScriptIds() { - return this.presetScriptIds != null; + /** Returns true if field presetNetworkExceptionIds is set (has been assigned a value) and false otherwise */ + public boolean isSetPresetNetworkExceptionIds() { + return this.presetNetworkExceptionIds != null; } - public void setPresetScriptIdsIsSet(boolean value) { + public void setPresetNetworkExceptionIdsIsSet(boolean value) { if (!value) { - this.presetScriptIds = null; + this.presetNetworkExceptionIds = null; } } @@ -1694,19 +1746,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } break; - case PRESET_NETWORK_SHARES: + case LDAP_FILTERS: if (value == null) { - unsetPresetNetworkShares(); + unsetLdapFilters(); } else { - setPresetNetworkShares((List<Integer>)value); + setLdapFilters((List<LdapFilter>)value); } break; - case LDAP_FILTERS: + case PRESET_SCRIPT_IDS: if (value == null) { - unsetLdapFilters(); + unsetPresetScriptIds(); } else { - setLdapFilters((List<LdapFilter>)value); + setPresetScriptIds((List<Integer>)value); + } + break; + + case PRESET_NETWORK_SHARES: + if (value == null) { + unsetPresetNetworkShares(); + } else { + setPresetNetworkShares((List<Integer>)value); } break; @@ -1718,11 +1778,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } break; - case PRESET_SCRIPT_IDS: + case PRESET_NETWORK_EXCEPTION_IDS: if (value == null) { - unsetPresetScriptIds(); + unsetPresetNetworkExceptionIds(); } else { - setPresetScriptIds((List<Integer>)value); + setPresetNetworkExceptionIds((List<Integer>)value); } break; @@ -1815,17 +1875,20 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case NETWORK_SHARES: return getNetworkShares(); - case PRESET_NETWORK_SHARES: - return getPresetNetworkShares(); - case LDAP_FILTERS: return getLdapFilters(); + case PRESET_SCRIPT_IDS: + return getPresetScriptIds(); + + case PRESET_NETWORK_SHARES: + return getPresetNetworkShares(); + case PRESET_LDAP_FILTERS: return getPresetLdapFilters(); - case PRESET_SCRIPT_IDS: - return getPresetScriptIds(); + case PRESET_NETWORK_EXCEPTION_IDS: + return getPresetNetworkExceptionIds(); } throw new IllegalStateException(); @@ -1894,14 +1957,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return isSetHasUsbAccess(); case NETWORK_SHARES: return isSetNetworkShares(); - case PRESET_NETWORK_SHARES: - return isSetPresetNetworkShares(); case LDAP_FILTERS: return isSetLdapFilters(); - case PRESET_LDAP_FILTERS: - return isSetPresetLdapFilters(); case PRESET_SCRIPT_IDS: return isSetPresetScriptIds(); + case PRESET_NETWORK_SHARES: + return isSetPresetNetworkShares(); + case PRESET_LDAP_FILTERS: + return isSetPresetLdapFilters(); + case PRESET_NETWORK_EXCEPTION_IDS: + return isSetPresetNetworkExceptionIds(); } throw new IllegalStateException(); } @@ -2171,15 +2236,6 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return false; } - boolean this_present_presetNetworkShares = true && this.isSetPresetNetworkShares(); - boolean that_present_presetNetworkShares = true && that.isSetPresetNetworkShares(); - if (this_present_presetNetworkShares || that_present_presetNetworkShares) { - if (!(this_present_presetNetworkShares && that_present_presetNetworkShares)) - return false; - if (!this.presetNetworkShares.equals(that.presetNetworkShares)) - return false; - } - boolean this_present_ldapFilters = true && this.isSetLdapFilters(); boolean that_present_ldapFilters = true && that.isSetLdapFilters(); if (this_present_ldapFilters || that_present_ldapFilters) { @@ -2189,6 +2245,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return false; } + boolean this_present_presetScriptIds = true && this.isSetPresetScriptIds(); + boolean that_present_presetScriptIds = true && that.isSetPresetScriptIds(); + if (this_present_presetScriptIds || that_present_presetScriptIds) { + if (!(this_present_presetScriptIds && that_present_presetScriptIds)) + return false; + if (!this.presetScriptIds.equals(that.presetScriptIds)) + return false; + } + + boolean this_present_presetNetworkShares = true && this.isSetPresetNetworkShares(); + boolean that_present_presetNetworkShares = true && that.isSetPresetNetworkShares(); + if (this_present_presetNetworkShares || that_present_presetNetworkShares) { + if (!(this_present_presetNetworkShares && that_present_presetNetworkShares)) + return false; + if (!this.presetNetworkShares.equals(that.presetNetworkShares)) + return false; + } + boolean this_present_presetLdapFilters = true && this.isSetPresetLdapFilters(); boolean that_present_presetLdapFilters = true && that.isSetPresetLdapFilters(); if (this_present_presetLdapFilters || that_present_presetLdapFilters) { @@ -2198,12 +2272,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return false; } - boolean this_present_presetScriptIds = true && this.isSetPresetScriptIds(); - boolean that_present_presetScriptIds = true && that.isSetPresetScriptIds(); - if (this_present_presetScriptIds || that_present_presetScriptIds) { - if (!(this_present_presetScriptIds && that_present_presetScriptIds)) + boolean this_present_presetNetworkExceptionIds = true && this.isSetPresetNetworkExceptionIds(); + boolean that_present_presetNetworkExceptionIds = true && that.isSetPresetNetworkExceptionIds(); + if (this_present_presetNetworkExceptionIds || that_present_presetNetworkExceptionIds) { + if (!(this_present_presetNetworkExceptionIds && that_present_presetNetworkExceptionIds)) return false; - if (!this.presetScriptIds.equals(that.presetScriptIds)) + if (!this.presetNetworkExceptionIds.equals(that.presetNetworkExceptionIds)) return false; } @@ -2354,25 +2428,30 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture if (present_networkShares) list.add(networkShares); - boolean present_presetNetworkShares = true && (isSetPresetNetworkShares()); - list.add(present_presetNetworkShares); - if (present_presetNetworkShares) - list.add(presetNetworkShares); - boolean present_ldapFilters = true && (isSetLdapFilters()); list.add(present_ldapFilters); if (present_ldapFilters) list.add(ldapFilters); + boolean present_presetScriptIds = true && (isSetPresetScriptIds()); + list.add(present_presetScriptIds); + if (present_presetScriptIds) + list.add(presetScriptIds); + + boolean present_presetNetworkShares = true && (isSetPresetNetworkShares()); + list.add(present_presetNetworkShares); + if (present_presetNetworkShares) + list.add(presetNetworkShares); + boolean present_presetLdapFilters = true && (isSetPresetLdapFilters()); list.add(present_presetLdapFilters); if (present_presetLdapFilters) list.add(presetLdapFilters); - boolean present_presetScriptIds = true && (isSetPresetScriptIds()); - list.add(present_presetScriptIds); - if (present_presetScriptIds) - list.add(presetScriptIds); + boolean present_presetNetworkExceptionIds = true && (isSetPresetNetworkExceptionIds()); + list.add(present_presetNetworkExceptionIds); + if (present_presetNetworkExceptionIds) + list.add(presetNetworkExceptionIds); return list.hashCode(); } @@ -2665,22 +2744,32 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPresetNetworkShares()).compareTo(other.isSetPresetNetworkShares()); + lastComparison = Boolean.valueOf(isSetLdapFilters()).compareTo(other.isSetLdapFilters()); if (lastComparison != 0) { return lastComparison; } - if (isSetPresetNetworkShares()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetNetworkShares, other.presetNetworkShares); + if (isSetLdapFilters()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ldapFilters, other.ldapFilters); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLdapFilters()).compareTo(other.isSetLdapFilters()); + lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds()); if (lastComparison != 0) { return lastComparison; } - if (isSetLdapFilters()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ldapFilters, other.ldapFilters); + if (isSetPresetScriptIds()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetScriptIds, other.presetScriptIds); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetPresetNetworkShares()).compareTo(other.isSetPresetNetworkShares()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPresetNetworkShares()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetNetworkShares, other.presetNetworkShares); if (lastComparison != 0) { return lastComparison; } @@ -2695,12 +2784,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds()); + lastComparison = Boolean.valueOf(isSetPresetNetworkExceptionIds()).compareTo(other.isSetPresetNetworkExceptionIds()); if (lastComparison != 0) { return lastComparison; } - if (isSetPresetScriptIds()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetScriptIds, other.presetScriptIds); + if (isSetPresetNetworkExceptionIds()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetNetworkExceptionIds, other.presetNetworkExceptionIds); if (lastComparison != 0) { return lastComparison; } @@ -2900,23 +2989,33 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } first = false; } - if (isSetPresetNetworkShares()) { + if (isSetLdapFilters()) { if (!first) sb.append(", "); - sb.append("presetNetworkShares:"); - if (this.presetNetworkShares == null) { + sb.append("ldapFilters:"); + if (this.ldapFilters == null) { sb.append("null"); } else { - sb.append(this.presetNetworkShares); + sb.append(this.ldapFilters); } first = false; } - if (isSetLdapFilters()) { + if (isSetPresetScriptIds()) { if (!first) sb.append(", "); - sb.append("ldapFilters:"); - if (this.ldapFilters == null) { + sb.append("presetScriptIds:"); + if (this.presetScriptIds == null) { sb.append("null"); } else { - sb.append(this.ldapFilters); + sb.append(this.presetScriptIds); + } + first = false; + } + if (isSetPresetNetworkShares()) { + if (!first) sb.append(", "); + sb.append("presetNetworkShares:"); + if (this.presetNetworkShares == null) { + sb.append("null"); + } else { + sb.append(this.presetNetworkShares); } first = false; } @@ -2930,13 +3029,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } first = false; } - if (isSetPresetScriptIds()) { + if (isSetPresetNetworkExceptionIds()) { if (!first) sb.append(", "); - sb.append("presetScriptIds:"); - if (this.presetScriptIds == null) { + sb.append("presetNetworkExceptionIds:"); + if (this.presetNetworkExceptionIds == null) { sb.append("null"); } else { - sb.append(this.presetScriptIds); + sb.append(this.presetNetworkExceptionIds); } first = false; } @@ -3122,13 +3221,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case 14: // NICS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list186 = iprot.readListBegin(); - struct.nics = new ArrayList<String>(_list186.size); - String _elem187; - for (int _i188 = 0; _i188 < _list186.size; ++_i188) + org.apache.thrift.protocol.TList _list202 = iprot.readListBegin(); + struct.nics = new ArrayList<String>(_list202.size); + String _elem203; + for (int _i204 = 0; _i204 < _list202.size; ++_i204) { - _elem187 = iprot.readString(); - struct.nics.add(_elem187); + _elem203 = iprot.readString(); + struct.nics.add(_elem203); } iprot.readListEnd(); } @@ -3140,13 +3239,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case 15: // ALLOWED_USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list189 = iprot.readListBegin(); - struct.allowedUsers = new ArrayList<String>(_list189.size); - String _elem190; - for (int _i191 = 0; _i191 < _list189.size; ++_i191) + org.apache.thrift.protocol.TList _list205 = iprot.readListBegin(); + struct.allowedUsers = new ArrayList<String>(_list205.size); + String _elem206; + for (int _i207 = 0; _i207 < _list205.size; ++_i207) { - _elem190 = iprot.readString(); - struct.allowedUsers.add(_elem190); + _elem206 = iprot.readString(); + struct.allowedUsers.add(_elem206); } iprot.readListEnd(); } @@ -3158,14 +3257,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case 16: // NETWORK_EXCEPTIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list192 = iprot.readListBegin(); - struct.networkExceptions = new ArrayList<NetRule>(_list192.size); - NetRule _elem193; - for (int _i194 = 0; _i194 < _list192.size; ++_i194) + org.apache.thrift.protocol.TList _list208 = iprot.readListBegin(); + struct.networkExceptions = new ArrayList<NetRule>(_list208.size); + NetRule _elem209; + for (int _i210 = 0; _i210 < _list208.size; ++_i210) { - _elem193 = new NetRule(); - _elem193.read(iprot); - struct.networkExceptions.add(_elem193); + _elem209 = new NetRule(); + _elem209.read(iprot); + struct.networkExceptions.add(_elem209); } iprot.readListEnd(); } @@ -3211,13 +3310,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case 25: // LOCATION_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list195 = iprot.readListBegin(); - struct.locationIds = new ArrayList<Integer>(_list195.size); - int _elem196; - for (int _i197 = 0; _i197 < _list195.size; ++_i197) + org.apache.thrift.protocol.TList _list211 = iprot.readListBegin(); + struct.locationIds = new ArrayList<Integer>(_list211.size); + int _elem212; + for (int _i213 = 0; _i213 < _list211.size; ++_i213) { - _elem196 = iprot.readI32(); - struct.locationIds.add(_elem196); + _elem212 = iprot.readI32(); + struct.locationIds.add(_elem212); } iprot.readListEnd(); } @@ -3253,14 +3352,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case 29: // NETWORK_SHARES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list198 = iprot.readListBegin(); - struct.networkShares = new ArrayList<NetShare>(_list198.size); - NetShare _elem199; - for (int _i200 = 0; _i200 < _list198.size; ++_i200) + org.apache.thrift.protocol.TList _list214 = iprot.readListBegin(); + struct.networkShares = new ArrayList<NetShare>(_list214.size); + NetShare _elem215; + for (int _i216 = 0; _i216 < _list214.size; ++_i216) { - _elem199 = new NetShare(); - _elem199.read(iprot); - struct.networkShares.add(_elem199); + _elem215 = new NetShare(); + _elem215.read(iprot); + struct.networkShares.add(_elem215); } iprot.readListEnd(); } @@ -3269,39 +3368,57 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 32: // PRESET_NETWORK_SHARES + case 30: // LDAP_FILTERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list201 = iprot.readListBegin(); - struct.presetNetworkShares = new ArrayList<Integer>(_list201.size); - int _elem202; - for (int _i203 = 0; _i203 < _list201.size; ++_i203) + org.apache.thrift.protocol.TList _list217 = iprot.readListBegin(); + struct.ldapFilters = new ArrayList<LdapFilter>(_list217.size); + LdapFilter _elem218; + for (int _i219 = 0; _i219 < _list217.size; ++_i219) { - _elem202 = iprot.readI32(); - struct.presetNetworkShares.add(_elem202); + _elem218 = new LdapFilter(); + _elem218.read(iprot); + struct.ldapFilters.add(_elem218); } iprot.readListEnd(); } - struct.setPresetNetworkSharesIsSet(true); + struct.setLdapFiltersIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 30: // LDAP_FILTERS + case 31: // PRESET_SCRIPT_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list204 = iprot.readListBegin(); - struct.ldapFilters = new ArrayList<LdapFilter>(_list204.size); - LdapFilter _elem205; - for (int _i206 = 0; _i206 < _list204.size; ++_i206) + org.apache.thrift.protocol.TList _list220 = iprot.readListBegin(); + struct.presetScriptIds = new ArrayList<Integer>(_list220.size); + int _elem221; + for (int _i222 = 0; _i222 < _list220.size; ++_i222) { - _elem205 = new LdapFilter(); - _elem205.read(iprot); - struct.ldapFilters.add(_elem205); + _elem221 = iprot.readI32(); + struct.presetScriptIds.add(_elem221); } iprot.readListEnd(); } - struct.setLdapFiltersIsSet(true); + struct.setPresetScriptIdsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 32: // PRESET_NETWORK_SHARES + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list223 = iprot.readListBegin(); + struct.presetNetworkShares = new ArrayList<Integer>(_list223.size); + int _elem224; + for (int _i225 = 0; _i225 < _list223.size; ++_i225) + { + _elem224 = iprot.readI32(); + struct.presetNetworkShares.add(_elem224); + } + iprot.readListEnd(); + } + struct.setPresetNetworkSharesIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -3309,13 +3426,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture case 33: // PRESET_LDAP_FILTERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list207 = iprot.readListBegin(); - struct.presetLdapFilters = new ArrayList<Integer>(_list207.size); - int _elem208; - for (int _i209 = 0; _i209 < _list207.size; ++_i209) + org.apache.thrift.protocol.TList _list226 = iprot.readListBegin(); + struct.presetLdapFilters = new ArrayList<Integer>(_list226.size); + int _elem227; + for (int _i228 = 0; _i228 < _list226.size; ++_i228) { - _elem208 = iprot.readI32(); - struct.presetLdapFilters.add(_elem208); + _elem227 = iprot.readI32(); + struct.presetLdapFilters.add(_elem227); } iprot.readListEnd(); } @@ -3324,20 +3441,20 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 31: // PRESET_SCRIPT_IDS + case 34: // PRESET_NETWORK_EXCEPTION_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list210 = iprot.readListBegin(); - struct.presetScriptIds = new ArrayList<Integer>(_list210.size); - int _elem211; - for (int _i212 = 0; _i212 < _list210.size; ++_i212) + org.apache.thrift.protocol.TList _list229 = iprot.readListBegin(); + struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list229.size); + int _elem230; + for (int _i231 = 0; _i231 < _list229.size; ++_i231) { - _elem211 = iprot.readI32(); - struct.presetScriptIds.add(_elem211); + _elem230 = iprot.readI32(); + struct.presetNetworkExceptionIds.add(_elem230); } iprot.readListEnd(); } - struct.setPresetScriptIdsIsSet(true); + struct.setPresetNetworkExceptionIdsIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -3409,9 +3526,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(NICS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size())); - for (String _iter213 : struct.nics) + for (String _iter232 : struct.nics) { - oprot.writeString(_iter213); + oprot.writeString(_iter232); } oprot.writeListEnd(); } @@ -3421,9 +3538,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(ALLOWED_USERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.allowedUsers.size())); - for (String _iter214 : struct.allowedUsers) + for (String _iter233 : struct.allowedUsers) { - oprot.writeString(_iter214); + oprot.writeString(_iter233); } oprot.writeListEnd(); } @@ -3433,9 +3550,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size())); - for (NetRule _iter215 : struct.networkExceptions) + for (NetRule _iter234 : struct.networkExceptions) { - _iter215.write(oprot); + _iter234.write(oprot); } oprot.writeListEnd(); } @@ -3479,9 +3596,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size())); - for (int _iter216 : struct.locationIds) + for (int _iter235 : struct.locationIds) { - oprot.writeI32(_iter216); + oprot.writeI32(_iter235); } oprot.writeListEnd(); } @@ -3501,9 +3618,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(NETWORK_SHARES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkShares.size())); - for (NetShare _iter217 : struct.networkShares) + for (NetShare _iter236 : struct.networkShares) { - _iter217.write(oprot); + _iter236.write(oprot); } oprot.writeListEnd(); } @@ -3515,9 +3632,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(LDAP_FILTERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ldapFilters.size())); - for (LdapFilter _iter218 : struct.ldapFilters) + for (LdapFilter _iter237 : struct.ldapFilters) { - _iter218.write(oprot); + _iter237.write(oprot); } oprot.writeListEnd(); } @@ -3529,9 +3646,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(PRESET_SCRIPT_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetScriptIds.size())); - for (int _iter219 : struct.presetScriptIds) + for (int _iter238 : struct.presetScriptIds) { - oprot.writeI32(_iter219); + oprot.writeI32(_iter238); } oprot.writeListEnd(); } @@ -3543,9 +3660,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(PRESET_NETWORK_SHARES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkShares.size())); - for (int _iter220 : struct.presetNetworkShares) + for (int _iter239 : struct.presetNetworkShares) { - oprot.writeI32(_iter220); + oprot.writeI32(_iter239); } oprot.writeListEnd(); } @@ -3557,9 +3674,23 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture oprot.writeFieldBegin(PRESET_LDAP_FILTERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetLdapFilters.size())); - for (int _iter221 : struct.presetLdapFilters) + for (int _iter240 : struct.presetLdapFilters) + { + oprot.writeI32(_iter240); + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + } + if (struct.presetNetworkExceptionIds != null) { + if (struct.isSetPresetNetworkExceptionIds()) { + oprot.writeFieldBegin(PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkExceptionIds.size())); + for (int _iter241 : struct.presetNetworkExceptionIds) { - oprot.writeI32(_iter221); + oprot.writeI32(_iter241); } oprot.writeListEnd(); } @@ -3668,19 +3799,22 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture if (struct.isSetNetworkShares()) { optionals.set(27); } - if (struct.isSetPresetNetworkShares()) { + if (struct.isSetLdapFilters()) { optionals.set(28); } - if (struct.isSetLdapFilters()) { + if (struct.isSetPresetScriptIds()) { optionals.set(29); } - if (struct.isSetPresetLdapFilters()) { + if (struct.isSetPresetNetworkShares()) { optionals.set(30); } - if (struct.isSetPresetScriptIds()) { + if (struct.isSetPresetLdapFilters()) { optionals.set(31); } - oprot.writeBitSet(optionals, 32); + if (struct.isSetPresetNetworkExceptionIds()) { + optionals.set(32); + } + oprot.writeBitSet(optionals, 33); if (struct.isSetLectureId()) { oprot.writeString(struct.lectureId); } @@ -3732,27 +3866,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture if (struct.isSetNics()) { { oprot.writeI32(struct.nics.size()); - for (String _iter222 : struct.nics) + for (String _iter242 : struct.nics) { - oprot.writeString(_iter222); + oprot.writeString(_iter242); } } } if (struct.isSetAllowedUsers()) { { oprot.writeI32(struct.allowedUsers.size()); - for (String _iter223 : struct.allowedUsers) + for (String _iter243 : struct.allowedUsers) { - oprot.writeString(_iter223); + oprot.writeString(_iter243); } } } if (struct.isSetNetworkExceptions()) { { oprot.writeI32(struct.networkExceptions.size()); - for (NetRule _iter224 : struct.networkExceptions) + for (NetRule _iter244 : struct.networkExceptions) { - _iter224.write(oprot); + _iter244.write(oprot); } } } @@ -3771,9 +3905,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture if (struct.isSetLocationIds()) { { oprot.writeI32(struct.locationIds.size()); - for (int _iter225 : struct.locationIds) + for (int _iter245 : struct.locationIds) { - oprot.writeI32(_iter225); + oprot.writeI32(_iter245); } } } @@ -3789,45 +3923,54 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture if (struct.isSetNetworkShares()) { { oprot.writeI32(struct.networkShares.size()); - for (NetShare _iter226 : struct.networkShares) + for (NetShare _iter246 : struct.networkShares) { - _iter226.write(oprot); + _iter246.write(oprot); } } } - if (struct.isSetPresetNetworkShares()) { + if (struct.isSetLdapFilters()) { { - oprot.writeI32(struct.presetNetworkShares.size()); - for (int _iter227 : struct.presetNetworkShares) + oprot.writeI32(struct.ldapFilters.size()); + for (LdapFilter _iter247 : struct.ldapFilters) { - oprot.writeI32(_iter227); + _iter247.write(oprot); } } } - if (struct.isSetLdapFilters()) { + if (struct.isSetPresetScriptIds()) { { - oprot.writeI32(struct.ldapFilters.size()); - for (LdapFilter _iter228 : struct.ldapFilters) + oprot.writeI32(struct.presetScriptIds.size()); + for (int _iter248 : struct.presetScriptIds) + { + oprot.writeI32(_iter248); + } + } + } + if (struct.isSetPresetNetworkShares()) { + { + oprot.writeI32(struct.presetNetworkShares.size()); + for (int _iter249 : struct.presetNetworkShares) { - _iter228.write(oprot); + oprot.writeI32(_iter249); } } } if (struct.isSetPresetLdapFilters()) { { oprot.writeI32(struct.presetLdapFilters.size()); - for (int _iter229 : struct.presetLdapFilters) + for (int _iter250 : struct.presetLdapFilters) { - oprot.writeI32(_iter229); + oprot.writeI32(_iter250); } } } - if (struct.isSetPresetScriptIds()) { + if (struct.isSetPresetNetworkExceptionIds()) { { - oprot.writeI32(struct.presetScriptIds.size()); - for (int _iter230 : struct.presetScriptIds) + oprot.writeI32(struct.presetNetworkExceptionIds.size()); + for (int _iter251 : struct.presetNetworkExceptionIds) { - oprot.writeI32(_iter230); + oprot.writeI32(_iter251); } } } @@ -3836,7 +3979,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture @Override public void read(org.apache.thrift.protocol.TProtocol prot, LectureRead struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(32); + BitSet incoming = iprot.readBitSet(33); if (incoming.get(0)) { struct.lectureId = iprot.readString(); struct.setLectureIdIsSet(true); @@ -3903,40 +4046,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } if (incoming.get(16)) { { - org.apache.thrift.protocol.TList _list231 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.nics = new ArrayList<String>(_list231.size); - String _elem232; - for (int _i233 = 0; _i233 < _list231.size; ++_i233) + org.apache.thrift.protocol.TList _list252 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.nics = new ArrayList<String>(_list252.size); + String _elem253; + for (int _i254 = 0; _i254 < _list252.size; ++_i254) { - _elem232 = iprot.readString(); - struct.nics.add(_elem232); + _elem253 = iprot.readString(); + struct.nics.add(_elem253); } } struct.setNicsIsSet(true); } if (incoming.get(17)) { { - org.apache.thrift.protocol.TList _list234 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.allowedUsers = new ArrayList<String>(_list234.size); - String _elem235; - for (int _i236 = 0; _i236 < _list234.size; ++_i236) + org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.allowedUsers = new ArrayList<String>(_list255.size); + String _elem256; + for (int _i257 = 0; _i257 < _list255.size; ++_i257) { - _elem235 = iprot.readString(); - struct.allowedUsers.add(_elem235); + _elem256 = iprot.readString(); + struct.allowedUsers.add(_elem256); } } struct.setAllowedUsersIsSet(true); } if (incoming.get(18)) { { - org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.networkExceptions = new ArrayList<NetRule>(_list237.size); - NetRule _elem238; - for (int _i239 = 0; _i239 < _list237.size; ++_i239) + org.apache.thrift.protocol.TList _list258 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.networkExceptions = new ArrayList<NetRule>(_list258.size); + NetRule _elem259; + for (int _i260 = 0; _i260 < _list258.size; ++_i260) { - _elem238 = new NetRule(); - _elem238.read(iprot); - struct.networkExceptions.add(_elem238); + _elem259 = new NetRule(); + _elem259.read(iprot); + struct.networkExceptions.add(_elem259); } } struct.setNetworkExceptionsIsSet(true); @@ -3961,13 +4104,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } if (incoming.get(23)) { { - org.apache.thrift.protocol.TList _list240 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.locationIds = new ArrayList<Integer>(_list240.size); - int _elem241; - for (int _i242 = 0; _i242 < _list240.size; ++_i242) + org.apache.thrift.protocol.TList _list261 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.locationIds = new ArrayList<Integer>(_list261.size); + int _elem262; + for (int _i263 = 0; _i263 < _list261.size; ++_i263) { - _elem241 = iprot.readI32(); - struct.locationIds.add(_elem241); + _elem262 = iprot.readI32(); + struct.locationIds.add(_elem262); } } struct.setLocationIdsIsSet(true); @@ -3986,70 +4129,83 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture } if (incoming.get(27)) { { - org.apache.thrift.protocol.TList _list243 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.networkShares = new ArrayList<NetShare>(_list243.size); - NetShare _elem244; - for (int _i245 = 0; _i245 < _list243.size; ++_i245) + org.apache.thrift.protocol.TList _list264 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.networkShares = new ArrayList<NetShare>(_list264.size); + NetShare _elem265; + for (int _i266 = 0; _i266 < _list264.size; ++_i266) { - _elem244 = new NetShare(); - _elem244.read(iprot); - struct.networkShares.add(_elem244); + _elem265 = new NetShare(); + _elem265.read(iprot); + struct.networkShares.add(_elem265); } } struct.setNetworkSharesIsSet(true); } if (incoming.get(28)) { { - org.apache.thrift.protocol.TList _list246 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.presetNetworkShares = new ArrayList<Integer>(_list246.size); - int _elem247; - for (int _i248 = 0; _i248 < _list246.size; ++_i248) + org.apache.thrift.protocol.TList _list267 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.ldapFilters = new ArrayList<LdapFilter>(_list267.size); + LdapFilter _elem268; + for (int _i269 = 0; _i269 < _list267.size; ++_i269) { - _elem247 = iprot.readI32(); - struct.presetNetworkShares.add(_elem247); + _elem268 = new LdapFilter(); + _elem268.read(iprot); + struct.ldapFilters.add(_elem268); } } - struct.setPresetNetworkSharesIsSet(true); + struct.setLdapFiltersIsSet(true); } if (incoming.get(29)) { { - org.apache.thrift.protocol.TList _list249 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.ldapFilters = new ArrayList<LdapFilter>(_list249.size); - LdapFilter _elem250; - for (int _i251 = 0; _i251 < _list249.size; ++_i251) + org.apache.thrift.protocol.TList _list270 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.presetScriptIds = new ArrayList<Integer>(_list270.size); + int _elem271; + for (int _i272 = 0; _i272 < _list270.size; ++_i272) { - _elem250 = new LdapFilter(); - _elem250.read(iprot); - struct.ldapFilters.add(_elem250); + _elem271 = iprot.readI32(); + struct.presetScriptIds.add(_elem271); } } - struct.setLdapFiltersIsSet(true); + struct.setPresetScriptIdsIsSet(true); } if (incoming.get(30)) { { - org.apache.thrift.protocol.TList _list252 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.presetLdapFilters = new ArrayList<Integer>(_list252.size); - int _elem253; - for (int _i254 = 0; _i254 < _list252.size; ++_i254) + org.apache.thrift.protocol.TList _list273 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.presetNetworkShares = new ArrayList<Integer>(_list273.size); + int _elem274; + for (int _i275 = 0; _i275 < _list273.size; ++_i275) { - _elem253 = iprot.readI32(); - struct.presetLdapFilters.add(_elem253); + _elem274 = iprot.readI32(); + struct.presetNetworkShares.add(_elem274); } } - struct.setPresetLdapFiltersIsSet(true); + struct.setPresetNetworkSharesIsSet(true); } if (incoming.get(31)) { { - org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.presetScriptIds = new ArrayList<Integer>(_list255.size); - int _elem256; - for (int _i257 = 0; _i257 < _list255.size; ++_i257) + org.apache.thrift.protocol.TList _list276 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.presetLdapFilters = new ArrayList<Integer>(_list276.size); + int _elem277; + for (int _i278 = 0; _i278 < _list276.size; ++_i278) { - _elem256 = iprot.readI32(); - struct.presetScriptIds.add(_elem256); + _elem277 = iprot.readI32(); + struct.presetLdapFilters.add(_elem277); } } - struct.setPresetScriptIdsIsSet(true); + struct.setPresetLdapFiltersIsSet(true); + } + if (incoming.get(32)) { + { + org.apache.thrift.protocol.TList _list279 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list279.size); + int _elem280; + for (int _i281 = 0; _i281 < _list279.size; ++_i281) + { + _elem280 = iprot.readI32(); + struct.presetNetworkExceptionIds.add(_elem280); + } + } + struct.setPresetNetworkExceptionIdsIsSet(true); } } } diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java index dfdc415..921ea64 100644 --- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java +++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-08") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25") public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, LectureWrite._Fields>, java.io.Serializable, Cloneable, Comparable<LectureWrite> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureWrite"); @@ -60,6 +60,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu private static final org.apache.thrift.protocol.TField NETWORK_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("networkShares", org.apache.thrift.protocol.TType.LIST, (short)21); private static final org.apache.thrift.protocol.TField LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("ldapFilters", org.apache.thrift.protocol.TType.LIST, (short)22); private static final org.apache.thrift.protocol.TField PRESET_SCRIPT_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetScriptIds", org.apache.thrift.protocol.TType.LIST, (short)23); + private static final org.apache.thrift.protocol.TField PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkExceptionIds", org.apache.thrift.protocol.TType.LIST, (short)24); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -89,6 +90,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu public List<NetShare> networkShares; // optional public List<LdapFilter> ldapFilters; // optional public List<Integer> presetScriptIds; // optional + public List<Integer> presetNetworkExceptionIds; // 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 { @@ -113,7 +115,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu HAS_USB_ACCESS((short)20, "hasUsbAccess"), NETWORK_SHARES((short)21, "networkShares"), LDAP_FILTERS((short)22, "ldapFilters"), - PRESET_SCRIPT_IDS((short)23, "presetScriptIds"); + PRESET_SCRIPT_IDS((short)23, "presetScriptIds"), + PRESET_NETWORK_EXCEPTION_IDS((short)24, "presetNetworkExceptionIds"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -172,6 +175,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu return LDAP_FILTERS; case 23: // PRESET_SCRIPT_IDS return PRESET_SCRIPT_IDS; + case 24: // PRESET_NETWORK_EXCEPTION_IDS + return PRESET_NETWORK_EXCEPTION_IDS; default: return null; } @@ -222,7 +227,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu private static final int __LIMITTOALLOWEDUSERS_ISSET_ID = 7; private static final int __HASUSBACCESS_ISSET_ID = 8; private short __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.NETWORK_EXCEPTIONS,_Fields.ADD_ALLOWED_USERS,_Fields.REM_ALLOWED_USERS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS}; + private static final _Fields optionals[] = {_Fields.NETWORK_EXCEPTIONS,_Fields.ADD_ALLOWED_USERS,_Fields.REM_ALLOWED_USERS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS,_Fields.PRESET_NETWORK_EXCEPTION_IDS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -278,6 +283,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu tmpMap.put(_Fields.PRESET_SCRIPT_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetScriptIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); + tmpMap.put(_Fields.PRESET_NETWORK_EXCEPTION_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkExceptionIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureWrite.class, metaDataMap); } @@ -401,6 +409,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds); this.presetScriptIds = __this__presetScriptIds; } + if (other.isSetPresetNetworkExceptionIds()) { + List<Integer> __this__presetNetworkExceptionIds = new ArrayList<Integer>(other.presetNetworkExceptionIds); + this.presetNetworkExceptionIds = __this__presetNetworkExceptionIds; + } } public LectureWrite deepCopy() { @@ -440,6 +452,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu this.networkShares = null; this.ldapFilters = null; this.presetScriptIds = null; + this.presetNetworkExceptionIds = null; } public String getLectureName() { @@ -1081,6 +1094,45 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu } } + public int getPresetNetworkExceptionIdsSize() { + return (this.presetNetworkExceptionIds == null) ? 0 : this.presetNetworkExceptionIds.size(); + } + + public java.util.Iterator<Integer> getPresetNetworkExceptionIdsIterator() { + return (this.presetNetworkExceptionIds == null) ? null : this.presetNetworkExceptionIds.iterator(); + } + + public void addToPresetNetworkExceptionIds(int elem) { + if (this.presetNetworkExceptionIds == null) { + this.presetNetworkExceptionIds = new ArrayList<Integer>(); + } + this.presetNetworkExceptionIds.add(elem); + } + + public List<Integer> getPresetNetworkExceptionIds() { + return this.presetNetworkExceptionIds; + } + + public LectureWrite setPresetNetworkExceptionIds(List<Integer> presetNetworkExceptionIds) { + this.presetNetworkExceptionIds = presetNetworkExceptionIds; + return this; + } + + public void unsetPresetNetworkExceptionIds() { + this.presetNetworkExceptionIds = null; + } + + /** Returns true if field presetNetworkExceptionIds is set (has been assigned a value) and false otherwise */ + public boolean isSetPresetNetworkExceptionIds() { + return this.presetNetworkExceptionIds != null; + } + + public void setPresetNetworkExceptionIdsIsSet(boolean value) { + if (!value) { + this.presetNetworkExceptionIds = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case LECTURE_NAME: @@ -1259,6 +1311,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu } break; + case PRESET_NETWORK_EXCEPTION_IDS: + if (value == null) { + unsetPresetNetworkExceptionIds(); + } else { + setPresetNetworkExceptionIds((List<Integer>)value); + } + break; + } } @@ -1330,6 +1390,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case PRESET_SCRIPT_IDS: return getPresetScriptIds(); + case PRESET_NETWORK_EXCEPTION_IDS: + return getPresetNetworkExceptionIds(); + } throw new IllegalStateException(); } @@ -1385,6 +1448,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu return isSetLdapFilters(); case PRESET_SCRIPT_IDS: return isSetPresetScriptIds(); + case PRESET_NETWORK_EXCEPTION_IDS: + return isSetPresetNetworkExceptionIds(); } throw new IllegalStateException(); } @@ -1600,6 +1665,15 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu return false; } + boolean this_present_presetNetworkExceptionIds = true && this.isSetPresetNetworkExceptionIds(); + boolean that_present_presetNetworkExceptionIds = true && that.isSetPresetNetworkExceptionIds(); + if (this_present_presetNetworkExceptionIds || that_present_presetNetworkExceptionIds) { + if (!(this_present_presetNetworkExceptionIds && that_present_presetNetworkExceptionIds)) + return false; + if (!this.presetNetworkExceptionIds.equals(that.presetNetworkExceptionIds)) + return false; + } + return true; } @@ -1717,6 +1791,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu if (present_presetScriptIds) list.add(presetScriptIds); + boolean present_presetNetworkExceptionIds = true && (isSetPresetNetworkExceptionIds()); + list.add(present_presetNetworkExceptionIds); + if (present_presetNetworkExceptionIds) + list.add(presetNetworkExceptionIds); + return list.hashCode(); } @@ -1948,6 +2027,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu return lastComparison; } } + lastComparison = Boolean.valueOf(isSetPresetNetworkExceptionIds()).compareTo(other.isSetPresetNetworkExceptionIds()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPresetNetworkExceptionIds()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetNetworkExceptionIds, other.presetNetworkExceptionIds); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -2119,6 +2208,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu } first = false; } + if (isSetPresetNetworkExceptionIds()) { + if (!first) sb.append(", "); + sb.append("presetNetworkExceptionIds:"); + if (this.presetNetworkExceptionIds == null) { + sb.append("null"); + } else { + sb.append(this.presetNetworkExceptionIds); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -2234,13 +2333,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 10: // NICS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list122 = iprot.readListBegin(); - struct.nics = new ArrayList<String>(_list122.size); - String _elem123; - for (int _i124 = 0; _i124 < _list122.size; ++_i124) + org.apache.thrift.protocol.TList _list130 = iprot.readListBegin(); + struct.nics = new ArrayList<String>(_list130.size); + String _elem131; + for (int _i132 = 0; _i132 < _list130.size; ++_i132) { - _elem123 = iprot.readString(); - struct.nics.add(_elem123); + _elem131 = iprot.readString(); + struct.nics.add(_elem131); } iprot.readListEnd(); } @@ -2252,14 +2351,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 12: // NETWORK_EXCEPTIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list125 = iprot.readListBegin(); - struct.networkExceptions = new ArrayList<NetRule>(_list125.size); - NetRule _elem126; - for (int _i127 = 0; _i127 < _list125.size; ++_i127) + org.apache.thrift.protocol.TList _list133 = iprot.readListBegin(); + struct.networkExceptions = new ArrayList<NetRule>(_list133.size); + NetRule _elem134; + for (int _i135 = 0; _i135 < _list133.size; ++_i135) { - _elem126 = new NetRule(); - _elem126.read(iprot); - struct.networkExceptions.add(_elem126); + _elem134 = new NetRule(); + _elem134.read(iprot); + struct.networkExceptions.add(_elem134); } iprot.readListEnd(); } @@ -2296,13 +2395,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 11: // ADD_ALLOWED_USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list128 = iprot.readListBegin(); - struct.addAllowedUsers = new ArrayList<String>(_list128.size); - String _elem129; - for (int _i130 = 0; _i130 < _list128.size; ++_i130) + org.apache.thrift.protocol.TList _list136 = iprot.readListBegin(); + struct.addAllowedUsers = new ArrayList<String>(_list136.size); + String _elem137; + for (int _i138 = 0; _i138 < _list136.size; ++_i138) { - _elem129 = iprot.readString(); - struct.addAllowedUsers.add(_elem129); + _elem137 = iprot.readString(); + struct.addAllowedUsers.add(_elem137); } iprot.readListEnd(); } @@ -2314,13 +2413,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 16: // REM_ALLOWED_USERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list131 = iprot.readListBegin(); - struct.remAllowedUsers = new ArrayList<String>(_list131.size); - String _elem132; - for (int _i133 = 0; _i133 < _list131.size; ++_i133) + org.apache.thrift.protocol.TList _list139 = iprot.readListBegin(); + struct.remAllowedUsers = new ArrayList<String>(_list139.size); + String _elem140; + for (int _i141 = 0; _i141 < _list139.size; ++_i141) { - _elem132 = iprot.readString(); - struct.remAllowedUsers.add(_elem132); + _elem140 = iprot.readString(); + struct.remAllowedUsers.add(_elem140); } iprot.readListEnd(); } @@ -2332,13 +2431,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 17: // LOCATION_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list134 = iprot.readListBegin(); - struct.locationIds = new ArrayList<Integer>(_list134.size); - int _elem135; - for (int _i136 = 0; _i136 < _list134.size; ++_i136) + org.apache.thrift.protocol.TList _list142 = iprot.readListBegin(); + struct.locationIds = new ArrayList<Integer>(_list142.size); + int _elem143; + for (int _i144 = 0; _i144 < _list142.size; ++_i144) { - _elem135 = iprot.readI32(); - struct.locationIds.add(_elem135); + _elem143 = iprot.readI32(); + struct.locationIds.add(_elem143); } iprot.readListEnd(); } @@ -2374,14 +2473,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 21: // NETWORK_SHARES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list137 = iprot.readListBegin(); - struct.networkShares = new ArrayList<NetShare>(_list137.size); - NetShare _elem138; - for (int _i139 = 0; _i139 < _list137.size; ++_i139) + org.apache.thrift.protocol.TList _list145 = iprot.readListBegin(); + struct.networkShares = new ArrayList<NetShare>(_list145.size); + NetShare _elem146; + for (int _i147 = 0; _i147 < _list145.size; ++_i147) { - _elem138 = new NetShare(); - _elem138.read(iprot); - struct.networkShares.add(_elem138); + _elem146 = new NetShare(); + _elem146.read(iprot); + struct.networkShares.add(_elem146); } iprot.readListEnd(); } @@ -2393,14 +2492,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 22: // LDAP_FILTERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list140 = iprot.readListBegin(); - struct.ldapFilters = new ArrayList<LdapFilter>(_list140.size); - LdapFilter _elem141; - for (int _i142 = 0; _i142 < _list140.size; ++_i142) + org.apache.thrift.protocol.TList _list148 = iprot.readListBegin(); + struct.ldapFilters = new ArrayList<LdapFilter>(_list148.size); + LdapFilter _elem149; + for (int _i150 = 0; _i150 < _list148.size; ++_i150) { - _elem141 = new LdapFilter(); - _elem141.read(iprot); - struct.ldapFilters.add(_elem141); + _elem149 = new LdapFilter(); + _elem149.read(iprot); + struct.ldapFilters.add(_elem149); } iprot.readListEnd(); } @@ -2412,13 +2511,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu case 23: // PRESET_SCRIPT_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list143 = iprot.readListBegin(); - struct.presetScriptIds = new ArrayList<Integer>(_list143.size); - int _elem144; - for (int _i145 = 0; _i145 < _list143.size; ++_i145) + org.apache.thrift.protocol.TList _list151 = iprot.readListBegin(); + struct.presetScriptIds = new ArrayList<Integer>(_list151.size); + int _elem152; + for (int _i153 = 0; _i153 < _list151.size; ++_i153) { - _elem144 = iprot.readI32(); - struct.presetScriptIds.add(_elem144); + _elem152 = iprot.readI32(); + struct.presetScriptIds.add(_elem152); } iprot.readListEnd(); } @@ -2427,6 +2526,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 24: // PRESET_NETWORK_EXCEPTION_IDS + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list154 = iprot.readListBegin(); + struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list154.size); + int _elem155; + for (int _i156 = 0; _i156 < _list154.size; ++_i156) + { + _elem155 = iprot.readI32(); + struct.presetNetworkExceptionIds.add(_elem155); + } + iprot.readListEnd(); + } + struct.setPresetNetworkExceptionIdsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -2478,9 +2595,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(NICS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size())); - for (String _iter146 : struct.nics) + for (String _iter157 : struct.nics) { - oprot.writeString(_iter146); + oprot.writeString(_iter157); } oprot.writeListEnd(); } @@ -2491,9 +2608,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(ADD_ALLOWED_USERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addAllowedUsers.size())); - for (String _iter147 : struct.addAllowedUsers) + for (String _iter158 : struct.addAllowedUsers) { - oprot.writeString(_iter147); + oprot.writeString(_iter158); } oprot.writeListEnd(); } @@ -2505,9 +2622,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size())); - for (NetRule _iter148 : struct.networkExceptions) + for (NetRule _iter159 : struct.networkExceptions) { - _iter148.write(oprot); + _iter159.write(oprot); } oprot.writeListEnd(); } @@ -2530,9 +2647,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(REM_ALLOWED_USERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.remAllowedUsers.size())); - for (String _iter149 : struct.remAllowedUsers) + for (String _iter160 : struct.remAllowedUsers) { - oprot.writeString(_iter149); + oprot.writeString(_iter160); } oprot.writeListEnd(); } @@ -2543,9 +2660,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size())); - for (int _iter150 : struct.locationIds) + for (int _iter161 : struct.locationIds) { - oprot.writeI32(_iter150); + oprot.writeI32(_iter161); } oprot.writeListEnd(); } @@ -2565,9 +2682,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(NETWORK_SHARES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkShares.size())); - for (NetShare _iter151 : struct.networkShares) + for (NetShare _iter162 : struct.networkShares) { - _iter151.write(oprot); + _iter162.write(oprot); } oprot.writeListEnd(); } @@ -2579,9 +2696,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(LDAP_FILTERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ldapFilters.size())); - for (LdapFilter _iter152 : struct.ldapFilters) + for (LdapFilter _iter163 : struct.ldapFilters) { - _iter152.write(oprot); + _iter163.write(oprot); } oprot.writeListEnd(); } @@ -2593,9 +2710,23 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu oprot.writeFieldBegin(PRESET_SCRIPT_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetScriptIds.size())); - for (int _iter153 : struct.presetScriptIds) + for (int _iter164 : struct.presetScriptIds) + { + oprot.writeI32(_iter164); + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + } + if (struct.presetNetworkExceptionIds != null) { + if (struct.isSetPresetNetworkExceptionIds()) { + oprot.writeFieldBegin(PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkExceptionIds.size())); + for (int _iter165 : struct.presetNetworkExceptionIds) { - oprot.writeI32(_iter153); + oprot.writeI32(_iter165); } oprot.writeListEnd(); } @@ -2686,7 +2817,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu if (struct.isSetPresetScriptIds()) { optionals.set(21); } - oprot.writeBitSet(optionals, 22); + if (struct.isSetPresetNetworkExceptionIds()) { + optionals.set(22); + } + oprot.writeBitSet(optionals, 23); if (struct.isSetLectureName()) { oprot.writeString(struct.lectureName); } @@ -2714,18 +2848,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu if (struct.isSetNics()) { { oprot.writeI32(struct.nics.size()); - for (String _iter154 : struct.nics) + for (String _iter166 : struct.nics) { - oprot.writeString(_iter154); + oprot.writeString(_iter166); } } } if (struct.isSetNetworkExceptions()) { { oprot.writeI32(struct.networkExceptions.size()); - for (NetRule _iter155 : struct.networkExceptions) + for (NetRule _iter167 : struct.networkExceptions) { - _iter155.write(oprot); + _iter167.write(oprot); } } } @@ -2741,27 +2875,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu if (struct.isSetAddAllowedUsers()) { { oprot.writeI32(struct.addAllowedUsers.size()); - for (String _iter156 : struct.addAllowedUsers) + for (String _iter168 : struct.addAllowedUsers) { - oprot.writeString(_iter156); + oprot.writeString(_iter168); } } } if (struct.isSetRemAllowedUsers()) { { oprot.writeI32(struct.remAllowedUsers.size()); - for (String _iter157 : struct.remAllowedUsers) + for (String _iter169 : struct.remAllowedUsers) { - oprot.writeString(_iter157); + oprot.writeString(_iter169); } } } if (struct.isSetLocationIds()) { { oprot.writeI32(struct.locationIds.size()); - for (int _iter158 : struct.locationIds) + for (int _iter170 : struct.locationIds) { - oprot.writeI32(_iter158); + oprot.writeI32(_iter170); } } } @@ -2777,27 +2911,36 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu if (struct.isSetNetworkShares()) { { oprot.writeI32(struct.networkShares.size()); - for (NetShare _iter159 : struct.networkShares) + for (NetShare _iter171 : struct.networkShares) { - _iter159.write(oprot); + _iter171.write(oprot); } } } if (struct.isSetLdapFilters()) { { oprot.writeI32(struct.ldapFilters.size()); - for (LdapFilter _iter160 : struct.ldapFilters) + for (LdapFilter _iter172 : struct.ldapFilters) { - _iter160.write(oprot); + _iter172.write(oprot); } } } if (struct.isSetPresetScriptIds()) { { oprot.writeI32(struct.presetScriptIds.size()); - for (int _iter161 : struct.presetScriptIds) + for (int _iter173 : struct.presetScriptIds) { - oprot.writeI32(_iter161); + oprot.writeI32(_iter173); + } + } + } + if (struct.isSetPresetNetworkExceptionIds()) { + { + oprot.writeI32(struct.presetNetworkExceptionIds.size()); + for (int _iter174 : struct.presetNetworkExceptionIds) + { + oprot.writeI32(_iter174); } } } @@ -2806,7 +2949,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu @Override public void read(org.apache.thrift.protocol.TProtocol prot, LectureWrite struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(22); + BitSet incoming = iprot.readBitSet(23); if (incoming.get(0)) { struct.lectureName = iprot.readString(); struct.setLectureNameIsSet(true); @@ -2841,27 +2984,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu } if (incoming.get(8)) { { - org.apache.thrift.protocol.TList _list162 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.nics = new ArrayList<String>(_list162.size); - String _elem163; - for (int _i164 = 0; _i164 < _list162.size; ++_i164) + org.apache.thrift.protocol.TList _list175 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.nics = new ArrayList<String>(_list175.size); + String _elem176; + for (int _i177 = 0; _i177 < _list175.size; ++_i177) { - _elem163 = iprot.readString(); - struct.nics.add(_elem163); + _elem176 = iprot.readString(); + struct.nics.add(_elem176); } } struct.setNicsIsSet(true); } if (incoming.get(9)) { { - org.apache.thrift.protocol.TList _list165 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.networkExceptions = new ArrayList<NetRule>(_list165.size); - NetRule _elem166; - for (int _i167 = 0; _i167 < _list165.size; ++_i167) + org.apache.thrift.protocol.TList _list178 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.networkExceptions = new ArrayList<NetRule>(_list178.size); + NetRule _elem179; + for (int _i180 = 0; _i180 < _list178.size; ++_i180) { - _elem166 = new NetRule(); - _elem166.read(iprot); - struct.networkExceptions.add(_elem166); + _elem179 = new NetRule(); + _elem179.read(iprot); + struct.networkExceptions.add(_elem179); } } struct.setNetworkExceptionsIsSet(true); @@ -2881,39 +3024,39 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu } if (incoming.get(13)) { { - org.apache.thrift.protocol.TList _list168 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.addAllowedUsers = new ArrayList<String>(_list168.size); - String _elem169; - for (int _i170 = 0; _i170 < _list168.size; ++_i170) + org.apache.thrift.protocol.TList _list181 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.addAllowedUsers = new ArrayList<String>(_list181.size); + String _elem182; + for (int _i183 = 0; _i183 < _list181.size; ++_i183) { - _elem169 = iprot.readString(); - struct.addAllowedUsers.add(_elem169); + _elem182 = iprot.readString(); + struct.addAllowedUsers.add(_elem182); } } struct.setAddAllowedUsersIsSet(true); } if (incoming.get(14)) { { - org.apache.thrift.protocol.TList _list171 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.remAllowedUsers = new ArrayList<String>(_list171.size); - String _elem172; - for (int _i173 = 0; _i173 < _list171.size; ++_i173) + org.apache.thrift.protocol.TList _list184 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.remAllowedUsers = new ArrayList<String>(_list184.size); + String _elem185; + for (int _i186 = 0; _i186 < _list184.size; ++_i186) { - _elem172 = iprot.readString(); - struct.remAllowedUsers.add(_elem172); + _elem185 = iprot.readString(); + struct.remAllowedUsers.add(_elem185); } } struct.setRemAllowedUsersIsSet(true); } if (incoming.get(15)) { { - org.apache.thrift.protocol.TList _list174 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.locationIds = new ArrayList<Integer>(_list174.size); - int _elem175; - for (int _i176 = 0; _i176 < _list174.size; ++_i176) + org.apache.thrift.protocol.TList _list187 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.locationIds = new ArrayList<Integer>(_list187.size); + int _elem188; + for (int _i189 = 0; _i189 < _list187.size; ++_i189) { - _elem175 = iprot.readI32(); - struct.locationIds.add(_elem175); + _elem188 = iprot.readI32(); + struct.locationIds.add(_elem188); } } struct.setLocationIdsIsSet(true); @@ -2932,45 +3075,58 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu } if (incoming.get(19)) { { - org.apache.thrift.protocol.TList _list177 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.networkShares = new ArrayList<NetShare>(_list177.size); - NetShare _elem178; - for (int _i179 = 0; _i179 < _list177.size; ++_i179) + org.apache.thrift.protocol.TList _list190 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.networkShares = new ArrayList<NetShare>(_list190.size); + NetShare _elem191; + for (int _i192 = 0; _i192 < _list190.size; ++_i192) { - _elem178 = new NetShare(); - _elem178.read(iprot); - struct.networkShares.add(_elem178); + _elem191 = new NetShare(); + _elem191.read(iprot); + struct.networkShares.add(_elem191); } } struct.setNetworkSharesIsSet(true); } if (incoming.get(20)) { { - org.apache.thrift.protocol.TList _list180 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.ldapFilters = new ArrayList<LdapFilter>(_list180.size); - LdapFilter _elem181; - for (int _i182 = 0; _i182 < _list180.size; ++_i182) + org.apache.thrift.protocol.TList _list193 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.ldapFilters = new ArrayList<LdapFilter>(_list193.size); + LdapFilter _elem194; + for (int _i195 = 0; _i195 < _list193.size; ++_i195) { - _elem181 = new LdapFilter(); - _elem181.read(iprot); - struct.ldapFilters.add(_elem181); + _elem194 = new LdapFilter(); + _elem194.read(iprot); + struct.ldapFilters.add(_elem194); } } struct.setLdapFiltersIsSet(true); } if (incoming.get(21)) { { - org.apache.thrift.protocol.TList _list183 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.presetScriptIds = new ArrayList<Integer>(_list183.size); - int _elem184; - for (int _i185 = 0; _i185 < _list183.size; ++_i185) + org.apache.thrift.protocol.TList _list196 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.presetScriptIds = new ArrayList<Integer>(_list196.size); + int _elem197; + for (int _i198 = 0; _i198 < _list196.size; ++_i198) { - _elem184 = iprot.readI32(); - struct.presetScriptIds.add(_elem184); + _elem197 = iprot.readI32(); + struct.presetScriptIds.add(_elem197); } } struct.setPresetScriptIdsIsSet(true); } + if (incoming.get(22)) { + { + org.apache.thrift.protocol.TList _list199 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list199.size); + int _elem200; + for (int _i201 = 0; _i201 < _list199.size; ++_i201) + { + _elem200 = iprot.readI32(); + struct.presetNetworkExceptionIds.add(_elem200); + } + } + struct.setPresetNetworkExceptionIdsIsSet(true); + } } } diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java index 8fcabe9..abc7486 100644 --- a/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java +++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-04") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25") public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields>, java.io.Serializable, Cloneable, Comparable<NetRule> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NetRule"); diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java b/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java index 539fb0e..4032b4e 100644 --- a/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java +++ b/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java @@ -34,13 +34,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-08") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25") public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, PredefinedData._Fields>, java.io.Serializable, Cloneable, Comparable<PredefinedData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PredefinedData"); private static final org.apache.thrift.protocol.TField NET_SHARES_FIELD_DESC = new org.apache.thrift.protocol.TField("netShares", org.apache.thrift.protocol.TType.LIST, (short)1); private static final org.apache.thrift.protocol.TField LDAP_FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("ldapFilter", org.apache.thrift.protocol.TType.LIST, (short)2); private static final org.apache.thrift.protocol.TField RUN_SCRIPTS_FIELD_DESC = new org.apache.thrift.protocol.TField("runScripts", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final org.apache.thrift.protocol.TField NETWORK_EXCEPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("networkExceptions", org.apache.thrift.protocol.TType.LIST, (short)4); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -51,12 +52,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P public List<NetShare> netShares; // required public List<LdapFilter> ldapFilter; // required public List<PresetRunScript> runScripts; // required + public List<PresetNetRule> networkExceptions; // 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 { NET_SHARES((short)1, "netShares"), LDAP_FILTER((short)2, "ldapFilter"), - RUN_SCRIPTS((short)3, "runScripts"); + RUN_SCRIPTS((short)3, "runScripts"), + NETWORK_EXCEPTIONS((short)4, "networkExceptions"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -77,6 +80,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P return LDAP_FILTER; case 3: // RUN_SCRIPTS return RUN_SCRIPTS; + case 4: // NETWORK_EXCEPTIONS + return NETWORK_EXCEPTIONS; default: return null; } @@ -129,6 +134,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P tmpMap.put(_Fields.RUN_SCRIPTS, new org.apache.thrift.meta_data.FieldMetaData("runScripts", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PresetRunScript.class)))); + tmpMap.put(_Fields.NETWORK_EXCEPTIONS, new org.apache.thrift.meta_data.FieldMetaData("networkExceptions", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PresetNetRule.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PredefinedData.class, metaDataMap); } @@ -139,12 +147,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P public PredefinedData( List<NetShare> netShares, List<LdapFilter> ldapFilter, - List<PresetRunScript> runScripts) + List<PresetRunScript> runScripts, + List<PresetNetRule> networkExceptions) { this(); this.netShares = netShares; this.ldapFilter = ldapFilter; this.runScripts = runScripts; + this.networkExceptions = networkExceptions; } /** @@ -172,6 +182,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P } this.runScripts = __this__runScripts; } + if (other.isSetNetworkExceptions()) { + List<PresetNetRule> __this__networkExceptions = new ArrayList<PresetNetRule>(other.networkExceptions.size()); + for (PresetNetRule other_element : other.networkExceptions) { + __this__networkExceptions.add(new PresetNetRule(other_element)); + } + this.networkExceptions = __this__networkExceptions; + } } public PredefinedData deepCopy() { @@ -183,6 +200,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P this.netShares = null; this.ldapFilter = null; this.runScripts = null; + this.networkExceptions = null; } public int getNetSharesSize() { @@ -302,6 +320,45 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P } } + public int getNetworkExceptionsSize() { + return (this.networkExceptions == null) ? 0 : this.networkExceptions.size(); + } + + public java.util.Iterator<PresetNetRule> getNetworkExceptionsIterator() { + return (this.networkExceptions == null) ? null : this.networkExceptions.iterator(); + } + + public void addToNetworkExceptions(PresetNetRule elem) { + if (this.networkExceptions == null) { + this.networkExceptions = new ArrayList<PresetNetRule>(); + } + this.networkExceptions.add(elem); + } + + public List<PresetNetRule> getNetworkExceptions() { + return this.networkExceptions; + } + + public PredefinedData setNetworkExceptions(List<PresetNetRule> networkExceptions) { + this.networkExceptions = networkExceptions; + return this; + } + + public void unsetNetworkExceptions() { + this.networkExceptions = null; + } + + /** Returns true if field networkExceptions is set (has been assigned a value) and false otherwise */ + public boolean isSetNetworkExceptions() { + return this.networkExceptions != null; + } + + public void setNetworkExceptionsIsSet(boolean value) { + if (!value) { + this.networkExceptions = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NET_SHARES: @@ -328,6 +385,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P } break; + case NETWORK_EXCEPTIONS: + if (value == null) { + unsetNetworkExceptions(); + } else { + setNetworkExceptions((List<PresetNetRule>)value); + } + break; + } } @@ -342,6 +407,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P case RUN_SCRIPTS: return getRunScripts(); + case NETWORK_EXCEPTIONS: + return getNetworkExceptions(); + } throw new IllegalStateException(); } @@ -359,6 +427,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P return isSetLdapFilter(); case RUN_SCRIPTS: return isSetRunScripts(); + case NETWORK_EXCEPTIONS: + return isSetNetworkExceptions(); } throw new IllegalStateException(); } @@ -403,6 +473,15 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P return false; } + boolean this_present_networkExceptions = true && this.isSetNetworkExceptions(); + boolean that_present_networkExceptions = true && that.isSetNetworkExceptions(); + if (this_present_networkExceptions || that_present_networkExceptions) { + if (!(this_present_networkExceptions && that_present_networkExceptions)) + return false; + if (!this.networkExceptions.equals(that.networkExceptions)) + return false; + } + return true; } @@ -425,6 +504,11 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P if (present_runScripts) list.add(runScripts); + boolean present_networkExceptions = true && (isSetNetworkExceptions()); + list.add(present_networkExceptions); + if (present_networkExceptions) + list.add(networkExceptions); + return list.hashCode(); } @@ -466,6 +550,16 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P return lastComparison; } } + lastComparison = Boolean.valueOf(isSetNetworkExceptions()).compareTo(other.isSetNetworkExceptions()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNetworkExceptions()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.networkExceptions, other.networkExceptions); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -509,6 +603,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P sb.append(this.runScripts); } first = false; + if (!first) sb.append(", "); + sb.append("networkExceptions:"); + if (this.networkExceptions == null) { + sb.append("null"); + } else { + sb.append(this.networkExceptions); + } + first = false; sb.append(")"); return sb.toString(); } @@ -555,14 +657,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P case 1: // NET_SHARES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list98 = iprot.readListBegin(); - struct.netShares = new ArrayList<NetShare>(_list98.size); - NetShare _elem99; - for (int _i100 = 0; _i100 < _list98.size; ++_i100) + org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(); + struct.netShares = new ArrayList<NetShare>(_list106.size); + NetShare _elem107; + for (int _i108 = 0; _i108 < _list106.size; ++_i108) { - _elem99 = new NetShare(); - _elem99.read(iprot); - struct.netShares.add(_elem99); + _elem107 = new NetShare(); + _elem107.read(iprot); + struct.netShares.add(_elem107); } iprot.readListEnd(); } @@ -574,14 +676,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P case 2: // LDAP_FILTER if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list101 = iprot.readListBegin(); - struct.ldapFilter = new ArrayList<LdapFilter>(_list101.size); - LdapFilter _elem102; - for (int _i103 = 0; _i103 < _list101.size; ++_i103) + org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(); + struct.ldapFilter = new ArrayList<LdapFilter>(_list109.size); + LdapFilter _elem110; + for (int _i111 = 0; _i111 < _list109.size; ++_i111) { - _elem102 = new LdapFilter(); - _elem102.read(iprot); - struct.ldapFilter.add(_elem102); + _elem110 = new LdapFilter(); + _elem110.read(iprot); + struct.ldapFilter.add(_elem110); } iprot.readListEnd(); } @@ -593,14 +695,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P case 3: // RUN_SCRIPTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list104 = iprot.readListBegin(); - struct.runScripts = new ArrayList<PresetRunScript>(_list104.size); - PresetRunScript _elem105; - for (int _i106 = 0; _i106 < _list104.size; ++_i106) + org.apache.thrift.protocol.TList _list112 = iprot.readListBegin(); + struct.runScripts = new ArrayList<PresetRunScript>(_list112.size); + PresetRunScript _elem113; + for (int _i114 = 0; _i114 < _list112.size; ++_i114) { - _elem105 = new PresetRunScript(); - _elem105.read(iprot); - struct.runScripts.add(_elem105); + _elem113 = new PresetRunScript(); + _elem113.read(iprot); + struct.runScripts.add(_elem113); } iprot.readListEnd(); } @@ -609,6 +711,25 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 4: // NETWORK_EXCEPTIONS + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list115 = iprot.readListBegin(); + struct.networkExceptions = new ArrayList<PresetNetRule>(_list115.size); + PresetNetRule _elem116; + for (int _i117 = 0; _i117 < _list115.size; ++_i117) + { + _elem116 = new PresetNetRule(); + _elem116.read(iprot); + struct.networkExceptions.add(_elem116); + } + iprot.readListEnd(); + } + struct.setNetworkExceptionsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -628,9 +749,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P oprot.writeFieldBegin(NET_SHARES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.netShares.size())); - for (NetShare _iter107 : struct.netShares) + for (NetShare _iter118 : struct.netShares) { - _iter107.write(oprot); + _iter118.write(oprot); } oprot.writeListEnd(); } @@ -640,9 +761,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P oprot.writeFieldBegin(LDAP_FILTER_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ldapFilter.size())); - for (LdapFilter _iter108 : struct.ldapFilter) + for (LdapFilter _iter119 : struct.ldapFilter) { - _iter108.write(oprot); + _iter119.write(oprot); } oprot.writeListEnd(); } @@ -652,9 +773,21 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P oprot.writeFieldBegin(RUN_SCRIPTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.runScripts.size())); - for (PresetRunScript _iter109 : struct.runScripts) + for (PresetRunScript _iter120 : struct.runScripts) { - _iter109.write(oprot); + _iter120.write(oprot); + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + if (struct.networkExceptions != null) { + oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size())); + for (PresetNetRule _iter121 : struct.networkExceptions) + { + _iter121.write(oprot); } oprot.writeListEnd(); } @@ -687,31 +820,43 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P if (struct.isSetRunScripts()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetNetworkExceptions()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetNetShares()) { { oprot.writeI32(struct.netShares.size()); - for (NetShare _iter110 : struct.netShares) + for (NetShare _iter122 : struct.netShares) { - _iter110.write(oprot); + _iter122.write(oprot); } } } if (struct.isSetLdapFilter()) { { oprot.writeI32(struct.ldapFilter.size()); - for (LdapFilter _iter111 : struct.ldapFilter) + for (LdapFilter _iter123 : struct.ldapFilter) { - _iter111.write(oprot); + _iter123.write(oprot); } } } if (struct.isSetRunScripts()) { { oprot.writeI32(struct.runScripts.size()); - for (PresetRunScript _iter112 : struct.runScripts) + for (PresetRunScript _iter124 : struct.runScripts) + { + _iter124.write(oprot); + } + } + } + if (struct.isSetNetworkExceptions()) { + { + oprot.writeI32(struct.networkExceptions.size()); + for (PresetNetRule _iter125 : struct.networkExceptions) { - _iter112.write(oprot); + _iter125.write(oprot); } } } @@ -720,49 +865,63 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P @Override public void read(org.apache.thrift.protocol.TProtocol prot, PredefinedData struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list113 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.netShares = new ArrayList<NetShare>(_list113.size); - NetShare _elem114; - for (int _i115 = 0; _i115 < _list113.size; ++_i115) + org.apache.thrift.protocol.TList _list126 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.netShares = new ArrayList<NetShare>(_list126.size); + NetShare _elem127; + for (int _i128 = 0; _i128 < _list126.size; ++_i128) { - _elem114 = new NetShare(); - _elem114.read(iprot); - struct.netShares.add(_elem114); + _elem127 = new NetShare(); + _elem127.read(iprot); + struct.netShares.add(_elem127); } } struct.setNetSharesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list116 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.ldapFilter = new ArrayList<LdapFilter>(_list116.size); - LdapFilter _elem117; - for (int _i118 = 0; _i118 < _list116.size; ++_i118) + org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.ldapFilter = new ArrayList<LdapFilter>(_list129.size); + LdapFilter _elem130; + for (int _i131 = 0; _i131 < _list129.size; ++_i131) { - _elem117 = new LdapFilter(); - _elem117.read(iprot); - struct.ldapFilter.add(_elem117); + _elem130 = new LdapFilter(); + _elem130.read(iprot); + struct.ldapFilter.add(_elem130); } } struct.setLdapFilterIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list119 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.runScripts = new ArrayList<PresetRunScript>(_list119.size); - PresetRunScript _elem120; - for (int _i121 = 0; _i121 < _list119.size; ++_i121) + org.apache.thrift.protocol.TList _list132 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.runScripts = new ArrayList<PresetRunScript>(_list132.size); + PresetRunScript _elem133; + for (int _i134 = 0; _i134 < _list132.size; ++_i134) { - _elem120 = new PresetRunScript(); - _elem120.read(iprot); - struct.runScripts.add(_elem120); + _elem133 = new PresetRunScript(); + _elem133.read(iprot); + struct.runScripts.add(_elem133); } } struct.setRunScriptsIsSet(true); } + if (incoming.get(3)) { + { + org.apache.thrift.protocol.TList _list135 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.networkExceptions = new ArrayList<PresetNetRule>(_list135.size); + PresetNetRule _elem136; + for (int _i137 = 0; _i137 < _list135.size; ++_i137) + { + _elem136 = new PresetNetRule(); + _elem136.read(iprot); + struct.networkExceptions.add(_elem136); + } + } + struct.setNetworkExceptionsIsSet(true); + } } } diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java b/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java new file mode 100644 index 0000000..262c8ac --- /dev/null +++ b/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java @@ -0,0 +1,660 @@ +/** + * Autogenerated by Thrift Compiler (0.9.3) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.openslx.bwlp.thrift.iface; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import javax.annotation.Generated; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25") +public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, PresetNetRule._Fields>, java.io.Serializable, Cloneable, Comparable<PresetNetRule> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PresetNetRule"); + + private static final org.apache.thrift.protocol.TField RULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("ruleId", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField DISPLAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("displayName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField NET_RULES_FIELD_DESC = new org.apache.thrift.protocol.TField("netRules", org.apache.thrift.protocol.TType.LIST, (short)3); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new PresetNetRuleStandardSchemeFactory()); + schemes.put(TupleScheme.class, new PresetNetRuleTupleSchemeFactory()); + } + + public int ruleId; // required + public String displayName; // required + public List<NetRule> netRules; // 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 { + RULE_ID((short)1, "ruleId"), + DISPLAY_NAME((short)2, "displayName"), + NET_RULES((short)3, "netRules"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // RULE_ID + return RULE_ID; + case 2: // DISPLAY_NAME + return DISPLAY_NAME; + case 3: // NET_RULES + return NET_RULES; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __RULEID_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.RULE_ID, new org.apache.thrift.meta_data.FieldMetaData("ruleId", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.NET_RULES, new org.apache.thrift.meta_data.FieldMetaData("netRules", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NetRule.class)))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PresetNetRule.class, metaDataMap); + } + + public PresetNetRule() { + } + + public PresetNetRule( + int ruleId, + String displayName, + List<NetRule> netRules) + { + this(); + this.ruleId = ruleId; + setRuleIdIsSet(true); + this.displayName = displayName; + this.netRules = netRules; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public PresetNetRule(PresetNetRule other) { + __isset_bitfield = other.__isset_bitfield; + this.ruleId = other.ruleId; + if (other.isSetDisplayName()) { + this.displayName = other.displayName; + } + if (other.isSetNetRules()) { + List<NetRule> __this__netRules = new ArrayList<NetRule>(other.netRules.size()); + for (NetRule other_element : other.netRules) { + __this__netRules.add(new NetRule(other_element)); + } + this.netRules = __this__netRules; + } + } + + public PresetNetRule deepCopy() { + return new PresetNetRule(this); + } + + @Override + public void clear() { + setRuleIdIsSet(false); + this.ruleId = 0; + this.displayName = null; + this.netRules = null; + } + + public int getRuleId() { + return this.ruleId; + } + + public PresetNetRule setRuleId(int ruleId) { + this.ruleId = ruleId; + setRuleIdIsSet(true); + return this; + } + + public void unsetRuleId() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RULEID_ISSET_ID); + } + + /** Returns true if field ruleId is set (has been assigned a value) and false otherwise */ + public boolean isSetRuleId() { + return EncodingUtils.testBit(__isset_bitfield, __RULEID_ISSET_ID); + } + + public void setRuleIdIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RULEID_ISSET_ID, value); + } + + public String getDisplayName() { + return this.displayName; + } + + public PresetNetRule setDisplayName(String displayName) { + this.displayName = displayName; + return this; + } + + public void unsetDisplayName() { + this.displayName = null; + } + + /** Returns true if field displayName is set (has been assigned a value) and false otherwise */ + public boolean isSetDisplayName() { + return this.displayName != null; + } + + public void setDisplayNameIsSet(boolean value) { + if (!value) { + this.displayName = null; + } + } + + public int getNetRulesSize() { + return (this.netRules == null) ? 0 : this.netRules.size(); + } + + public java.util.Iterator<NetRule> getNetRulesIterator() { + return (this.netRules == null) ? null : this.netRules.iterator(); + } + + public void addToNetRules(NetRule elem) { + if (this.netRules == null) { + this.netRules = new ArrayList<NetRule>(); + } + this.netRules.add(elem); + } + + public List<NetRule> getNetRules() { + return this.netRules; + } + + public PresetNetRule setNetRules(List<NetRule> netRules) { + this.netRules = netRules; + return this; + } + + public void unsetNetRules() { + this.netRules = null; + } + + /** Returns true if field netRules is set (has been assigned a value) and false otherwise */ + public boolean isSetNetRules() { + return this.netRules != null; + } + + public void setNetRulesIsSet(boolean value) { + if (!value) { + this.netRules = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case RULE_ID: + if (value == null) { + unsetRuleId(); + } else { + setRuleId((Integer)value); + } + break; + + case DISPLAY_NAME: + if (value == null) { + unsetDisplayName(); + } else { + setDisplayName((String)value); + } + break; + + case NET_RULES: + if (value == null) { + unsetNetRules(); + } else { + setNetRules((List<NetRule>)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case RULE_ID: + return getRuleId(); + + case DISPLAY_NAME: + return getDisplayName(); + + case NET_RULES: + return getNetRules(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case RULE_ID: + return isSetRuleId(); + case DISPLAY_NAME: + return isSetDisplayName(); + case NET_RULES: + return isSetNetRules(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof PresetNetRule) + return this.equals((PresetNetRule)that); + return false; + } + + public boolean equals(PresetNetRule that) { + if (that == null) + return false; + + boolean this_present_ruleId = true; + boolean that_present_ruleId = true; + if (this_present_ruleId || that_present_ruleId) { + if (!(this_present_ruleId && that_present_ruleId)) + return false; + if (this.ruleId != that.ruleId) + return false; + } + + boolean this_present_displayName = true && this.isSetDisplayName(); + boolean that_present_displayName = true && that.isSetDisplayName(); + if (this_present_displayName || that_present_displayName) { + if (!(this_present_displayName && that_present_displayName)) + return false; + if (!this.displayName.equals(that.displayName)) + return false; + } + + boolean this_present_netRules = true && this.isSetNetRules(); + boolean that_present_netRules = true && that.isSetNetRules(); + if (this_present_netRules || that_present_netRules) { + if (!(this_present_netRules && that_present_netRules)) + return false; + if (!this.netRules.equals(that.netRules)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + List<Object> list = new ArrayList<Object>(); + + boolean present_ruleId = true; + list.add(present_ruleId); + if (present_ruleId) + list.add(ruleId); + + boolean present_displayName = true && (isSetDisplayName()); + list.add(present_displayName); + if (present_displayName) + list.add(displayName); + + boolean present_netRules = true && (isSetNetRules()); + list.add(present_netRules); + if (present_netRules) + list.add(netRules); + + return list.hashCode(); + } + + @Override + public int compareTo(PresetNetRule other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetRuleId()).compareTo(other.isSetRuleId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetRuleId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ruleId, other.ruleId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDisplayName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.displayName, other.displayName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetNetRules()).compareTo(other.isSetNetRules()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNetRules()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.netRules, other.netRules); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("PresetNetRule("); + boolean first = true; + + sb.append("ruleId:"); + sb.append(this.ruleId); + first = false; + if (!first) sb.append(", "); + sb.append("displayName:"); + if (this.displayName == null) { + sb.append("null"); + } else { + sb.append(this.displayName); + } + first = false; + if (!first) sb.append(", "); + sb.append("netRules:"); + if (this.netRules == null) { + sb.append("null"); + } else { + sb.append(this.netRules); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class PresetNetRuleStandardSchemeFactory implements SchemeFactory { + public PresetNetRuleStandardScheme getScheme() { + return new PresetNetRuleStandardScheme(); + } + } + + private static class PresetNetRuleStandardScheme extends StandardScheme<PresetNetRule> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, PresetNetRule 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: // RULE_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.ruleId = iprot.readI32(); + struct.setRuleIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // DISPLAY_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.displayName = iprot.readString(); + struct.setDisplayNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // NET_RULES + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list98 = iprot.readListBegin(); + struct.netRules = new ArrayList<NetRule>(_list98.size); + NetRule _elem99; + for (int _i100 = 0; _i100 < _list98.size; ++_i100) + { + _elem99 = new NetRule(); + _elem99.read(iprot); + struct.netRules.add(_elem99); + } + iprot.readListEnd(); + } + struct.setNetRulesIsSet(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, PresetNetRule struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(RULE_ID_FIELD_DESC); + oprot.writeI32(struct.ruleId); + oprot.writeFieldEnd(); + if (struct.displayName != null) { + oprot.writeFieldBegin(DISPLAY_NAME_FIELD_DESC); + oprot.writeString(struct.displayName); + oprot.writeFieldEnd(); + } + if (struct.netRules != null) { + oprot.writeFieldBegin(NET_RULES_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.netRules.size())); + for (NetRule _iter101 : struct.netRules) + { + _iter101.write(oprot); + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class PresetNetRuleTupleSchemeFactory implements SchemeFactory { + public PresetNetRuleTupleScheme getScheme() { + return new PresetNetRuleTupleScheme(); + } + } + + private static class PresetNetRuleTupleScheme extends TupleScheme<PresetNetRule> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, PresetNetRule struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetRuleId()) { + optionals.set(0); + } + if (struct.isSetDisplayName()) { + optionals.set(1); + } + if (struct.isSetNetRules()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetRuleId()) { + oprot.writeI32(struct.ruleId); + } + if (struct.isSetDisplayName()) { + oprot.writeString(struct.displayName); + } + if (struct.isSetNetRules()) { + { + oprot.writeI32(struct.netRules.size()); + for (NetRule _iter102 : struct.netRules) + { + _iter102.write(oprot); + } + } + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, PresetNetRule struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(3); + if (incoming.get(0)) { + struct.ruleId = iprot.readI32(); + struct.setRuleIdIsSet(true); + } + if (incoming.get(1)) { + struct.displayName = iprot.readString(); + struct.setDisplayNameIsSet(true); + } + if (incoming.get(2)) { + { + org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.netRules = new ArrayList<NetRule>(_list103.size); + NetRule _elem104; + for (int _i105 = 0; _i105 < _list103.size; ++_i105) + { + _elem104 = new NetRule(); + _elem104.read(iprot); + struct.netRules.add(_elem104); + } + } + struct.setNetRulesIsSet(true); + } + } + } + +} + diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift index 308b62b..94afcf1 100644 --- a/src/main/thrift/bwlp.thrift +++ b/src/main/thrift/bwlp.thrift @@ -274,10 +274,17 @@ struct PresetRunScript { 3: list<i32> osIds, } +struct PresetNetRule { + 1: i32 ruleId, + 2: string displayName, + 3: list<NetRule> netRules, +} + struct PredefinedData { 1: list<NetShare> netShares, 2: list<LdapFilter> ldapFilter, 3: list<PresetRunScript> runScripts, + 4: list<PresetNetRule> networkExceptions, } // Write lecture to sat. if optional fields are not set or null, their value stays unchanged @@ -304,6 +311,7 @@ struct LectureWrite { 21: optional list<NetShare> networkShares, 22: optional list<LdapFilter> ldapFilters, 23: optional list<i32> presetScriptIds, + 24: optional list<i32> presetNetworkExceptionIds, } struct LectureSummary { @@ -355,10 +363,11 @@ struct LectureRead { 27: bool limitToAllowedUsers, 28: bool hasUsbAccess, 29: optional list<NetShare> networkShares, - 32: optional list<i32> presetNetworkShares, 30: optional list<LdapFilter> ldapFilters, - 33: optional list<i32> presetLdapFilters, 31: optional list<i32> presetScriptIds, + 32: optional list<i32> presetNetworkShares, + 33: optional list<i32> presetLdapFilters, + 34: optional list<i32> presetNetworkExceptionIds, } struct MasterTag { |