From b9d58c09588d58e4c4e6fb93fcc3db75e70805fa Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 26 Feb 2019 18:10:47 +0100 Subject: Add predefined firewall rulesets --- .../org/openslx/bwlp/thrift/iface/LectureRead.java | 788 ++++++++++++--------- .../openslx/bwlp/thrift/iface/LectureWrite.java | 434 ++++++++---- .../org/openslx/bwlp/thrift/iface/NetRule.java | 2 +- .../openslx/bwlp/thrift/iface/PredefinedData.java | 277 ++++++-- .../openslx/bwlp/thrift/iface/PresetNetRule.java | 660 +++++++++++++++++ src/main/thrift/bwlp.thrift | 13 +- 6 files changed, 1657 insertions(+), 517 deletions(-) create mode 100644 src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java 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, java.io.Serializable, Cloneable, Comparable { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -105,10 +106,11 @@ public class LectureRead implements org.apache.thrift.TBase networkShares; // optional - public List presetNetworkShares; // optional public List ldapFilters; // optional - public List presetLdapFilters; // optional public List presetScriptIds; // optional + public List presetNetworkShares; // optional + public List presetLdapFilters; // optional + public List 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 byName = new HashMap(); @@ -214,14 +217,16 @@ public class LectureRead implements org.apache.thrift.TBase 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 __this__presetNetworkShares = new ArrayList(other.presetNetworkShares); - this.presetNetworkShares = __this__presetNetworkShares; - } if (other.isSetLdapFilters()) { List __this__ldapFilters = new ArrayList(other.ldapFilters.size()); for (LdapFilter other_element : other.ldapFilters) { @@ -515,13 +519,21 @@ public class LectureRead implements org.apache.thrift.TBase __this__presetScriptIds = new ArrayList(other.presetScriptIds); + this.presetScriptIds = __this__presetScriptIds; + } + if (other.isSetPresetNetworkShares()) { + List __this__presetNetworkShares = new ArrayList(other.presetNetworkShares); + this.presetNetworkShares = __this__presetNetworkShares; + } if (other.isSetPresetLdapFilters()) { List __this__presetLdapFilters = new ArrayList(other.presetLdapFilters); this.presetLdapFilters = __this__presetLdapFilters; } - if (other.isSetPresetScriptIds()) { - List __this__presetScriptIds = new ArrayList(other.presetScriptIds); - this.presetScriptIds = __this__presetScriptIds; + if (other.isSetPresetNetworkExceptionIds()) { + List __this__presetNetworkExceptionIds = new ArrayList(other.presetNetworkExceptionIds); + this.presetNetworkExceptionIds = __this__presetNetworkExceptionIds; } } @@ -572,10 +584,11 @@ public class LectureRead implements org.apache.thrift.TBase getPresetNetworkSharesIterator() { - return (this.presetNetworkShares == null) ? null : this.presetNetworkShares.iterator(); + public java.util.Iterator getLdapFiltersIterator() { + return (this.ldapFilters == null) ? null : this.ldapFilters.iterator(); } - public void addToPresetNetworkShares(int elem) { - if (this.presetNetworkShares == null) { - this.presetNetworkShares = new ArrayList(); + public void addToLdapFilters(LdapFilter elem) { + if (this.ldapFilters == null) { + this.ldapFilters = new ArrayList(); } - this.presetNetworkShares.add(elem); + this.ldapFilters.add(elem); } - public List getPresetNetworkShares() { - return this.presetNetworkShares; + public List getLdapFilters() { + return this.ldapFilters; } - public LectureRead setPresetNetworkShares(List presetNetworkShares) { - this.presetNetworkShares = presetNetworkShares; + public LectureRead setLdapFilters(List 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 getLdapFiltersIterator() { - return (this.ldapFilters == null) ? null : this.ldapFilters.iterator(); + public java.util.Iterator getPresetScriptIdsIterator() { + return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator(); } - public void addToLdapFilters(LdapFilter elem) { - if (this.ldapFilters == null) { - this.ldapFilters = new ArrayList(); + public void addToPresetScriptIds(int elem) { + if (this.presetScriptIds == null) { + this.presetScriptIds = new ArrayList(); } - this.ldapFilters.add(elem); + this.presetScriptIds.add(elem); } - public List getLdapFilters() { - return this.ldapFilters; + public List getPresetScriptIds() { + return this.presetScriptIds; } - public LectureRead setLdapFilters(List ldapFilters) { - this.ldapFilters = ldapFilters; + public LectureRead setPresetScriptIds(List 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 getPresetNetworkSharesIterator() { + return (this.presetNetworkShares == null) ? null : this.presetNetworkShares.iterator(); + } + + public void addToPresetNetworkShares(int elem) { + if (this.presetNetworkShares == null) { + this.presetNetworkShares = new ArrayList(); + } + this.presetNetworkShares.add(elem); + } + + public List getPresetNetworkShares() { + return this.presetNetworkShares; + } + + public LectureRead setPresetNetworkShares(List 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 getPresetScriptIdsIterator() { - return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator(); + public java.util.Iterator getPresetNetworkExceptionIdsIterator() { + return (this.presetNetworkExceptionIds == null) ? null : this.presetNetworkExceptionIds.iterator(); } - public void addToPresetScriptIds(int elem) { - if (this.presetScriptIds == null) { - this.presetScriptIds = new ArrayList(); + public void addToPresetNetworkExceptionIds(int elem) { + if (this.presetNetworkExceptionIds == null) { + this.presetNetworkExceptionIds = new ArrayList(); } - this.presetScriptIds.add(elem); + this.presetNetworkExceptionIds.add(elem); } - public List getPresetScriptIds() { - return this.presetScriptIds; + public List getPresetNetworkExceptionIds() { + return this.presetNetworkExceptionIds; } - public LectureRead setPresetScriptIds(List presetScriptIds) { - this.presetScriptIds = presetScriptIds; + public LectureRead setPresetNetworkExceptionIds(List 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)value); + setLdapFilters((List)value); } break; - case LDAP_FILTERS: + case PRESET_SCRIPT_IDS: if (value == null) { - unsetLdapFilters(); + unsetPresetScriptIds(); } else { - setLdapFilters((List)value); + setPresetScriptIds((List)value); + } + break; + + case PRESET_NETWORK_SHARES: + if (value == null) { + unsetPresetNetworkShares(); + } else { + setPresetNetworkShares((List)value); } break; @@ -1718,11 +1778,11 @@ public class LectureRead implements org.apache.thrift.TBase)value); + setPresetNetworkExceptionIds((List)value); } break; @@ -1815,17 +1875,20 @@ public class LectureRead implements org.apache.thrift.TBase(_list186.size); - String _elem187; - for (int _i188 = 0; _i188 < _list186.size; ++_i188) + org.apache.thrift.protocol.TList _list202 = iprot.readListBegin(); + struct.nics = new ArrayList(_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(_list189.size); - String _elem190; - for (int _i191 = 0; _i191 < _list189.size; ++_i191) + org.apache.thrift.protocol.TList _list205 = iprot.readListBegin(); + struct.allowedUsers = new ArrayList(_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(_list192.size); - NetRule _elem193; - for (int _i194 = 0; _i194 < _list192.size; ++_i194) + org.apache.thrift.protocol.TList _list208 = iprot.readListBegin(); + struct.networkExceptions = new ArrayList(_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(_list195.size); - int _elem196; - for (int _i197 = 0; _i197 < _list195.size; ++_i197) + org.apache.thrift.protocol.TList _list211 = iprot.readListBegin(); + struct.locationIds = new ArrayList(_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(_list198.size); - NetShare _elem199; - for (int _i200 = 0; _i200 < _list198.size; ++_i200) + org.apache.thrift.protocol.TList _list214 = iprot.readListBegin(); + struct.networkShares = new ArrayList(_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(_list201.size); - int _elem202; - for (int _i203 = 0; _i203 < _list201.size; ++_i203) + org.apache.thrift.protocol.TList _list217 = iprot.readListBegin(); + struct.ldapFilters = new ArrayList(_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(_list204.size); - LdapFilter _elem205; - for (int _i206 = 0; _i206 < _list204.size; ++_i206) + org.apache.thrift.protocol.TList _list220 = iprot.readListBegin(); + struct.presetScriptIds = new ArrayList(_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(_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(_list207.size); - int _elem208; - for (int _i209 = 0; _i209 < _list207.size; ++_i209) + org.apache.thrift.protocol.TList _list226 = iprot.readListBegin(); + struct.presetLdapFilters = new ArrayList(_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(_list210.size); - int _elem211; - for (int _i212 = 0; _i212 < _list210.size; ++_i212) + org.apache.thrift.protocol.TList _list229 = iprot.readListBegin(); + struct.presetNetworkExceptionIds = new ArrayList(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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, java.io.Serializable, Cloneable, Comparable { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -89,6 +90,7 @@ public class LectureWrite implements org.apache.thrift.TBase networkShares; // optional public List ldapFilters; // optional public List presetScriptIds; // optional + public List 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 byName = new HashMap(); @@ -172,6 +175,8 @@ public class LectureWrite implements org.apache.thrift.TBase 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 __this__presetScriptIds = new ArrayList(other.presetScriptIds); this.presetScriptIds = __this__presetScriptIds; } + if (other.isSetPresetNetworkExceptionIds()) { + List __this__presetNetworkExceptionIds = new ArrayList(other.presetNetworkExceptionIds); + this.presetNetworkExceptionIds = __this__presetNetworkExceptionIds; + } } public LectureWrite deepCopy() { @@ -440,6 +452,7 @@ public class LectureWrite implements org.apache.thrift.TBase getPresetNetworkExceptionIdsIterator() { + return (this.presetNetworkExceptionIds == null) ? null : this.presetNetworkExceptionIds.iterator(); + } + + public void addToPresetNetworkExceptionIds(int elem) { + if (this.presetNetworkExceptionIds == null) { + this.presetNetworkExceptionIds = new ArrayList(); + } + this.presetNetworkExceptionIds.add(elem); + } + + public List getPresetNetworkExceptionIds() { + return this.presetNetworkExceptionIds; + } + + public LectureWrite setPresetNetworkExceptionIds(List 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)value); + } + break; + } } @@ -1330,6 +1390,9 @@ public class LectureWrite implements org.apache.thrift.TBase(_list122.size); - String _elem123; - for (int _i124 = 0; _i124 < _list122.size; ++_i124) + org.apache.thrift.protocol.TList _list130 = iprot.readListBegin(); + struct.nics = new ArrayList(_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(_list125.size); - NetRule _elem126; - for (int _i127 = 0; _i127 < _list125.size; ++_i127) + org.apache.thrift.protocol.TList _list133 = iprot.readListBegin(); + struct.networkExceptions = new ArrayList(_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(_list128.size); - String _elem129; - for (int _i130 = 0; _i130 < _list128.size; ++_i130) + org.apache.thrift.protocol.TList _list136 = iprot.readListBegin(); + struct.addAllowedUsers = new ArrayList(_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(_list131.size); - String _elem132; - for (int _i133 = 0; _i133 < _list131.size; ++_i133) + org.apache.thrift.protocol.TList _list139 = iprot.readListBegin(); + struct.remAllowedUsers = new ArrayList(_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(_list134.size); - int _elem135; - for (int _i136 = 0; _i136 < _list134.size; ++_i136) + org.apache.thrift.protocol.TList _list142 = iprot.readListBegin(); + struct.locationIds = new ArrayList(_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(_list137.size); - NetShare _elem138; - for (int _i139 = 0; _i139 < _list137.size; ++_i139) + org.apache.thrift.protocol.TList _list145 = iprot.readListBegin(); + struct.networkShares = new ArrayList(_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(_list140.size); - LdapFilter _elem141; - for (int _i142 = 0; _i142 < _list140.size; ++_i142) + org.apache.thrift.protocol.TList _list148 = iprot.readListBegin(); + struct.ldapFilters = new ArrayList(_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(_list143.size); - int _elem144; - for (int _i145 = 0; _i145 < _list143.size; ++_i145) + org.apache.thrift.protocol.TList _list151 = iprot.readListBegin(); + struct.presetScriptIds = new ArrayList(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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(_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, java.io.Serializable, Cloneable, Comparable { 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, java.io.Serializable, Cloneable, Comparable { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -51,12 +52,14 @@ public class PredefinedData implements org.apache.thrift.TBase netShares; // required public List ldapFilter; // required public List runScripts; // required + public List 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 byName = new HashMap(); @@ -77,6 +80,8 @@ public class PredefinedData implements org.apache.thrift.TBase netShares, List ldapFilter, - List runScripts) + List runScripts, + List 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 __this__networkExceptions = new ArrayList(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 getNetworkExceptionsIterator() { + return (this.networkExceptions == null) ? null : this.networkExceptions.iterator(); + } + + public void addToNetworkExceptions(PresetNetRule elem) { + if (this.networkExceptions == null) { + this.networkExceptions = new ArrayList(); + } + this.networkExceptions.add(elem); + } + + public List getNetworkExceptions() { + return this.networkExceptions; + } + + public PredefinedData setNetworkExceptions(List 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)value); + } + break; + } } @@ -342,6 +407,9 @@ public class PredefinedData implements org.apache.thrift.TBase(_list98.size); - NetShare _elem99; - for (int _i100 = 0; _i100 < _list98.size; ++_i100) + org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(); + struct.netShares = new ArrayList(_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(_list101.size); - LdapFilter _elem102; - for (int _i103 = 0; _i103 < _list101.size; ++_i103) + org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(); + struct.ldapFilter = new ArrayList(_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(_list104.size); - PresetRunScript _elem105; - for (int _i106 = 0; _i106 < _list104.size; ++_i106) + org.apache.thrift.protocol.TList _list112 = iprot.readListBegin(); + struct.runScripts = new ArrayList(_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(_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(_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(_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(_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(_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(_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(_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(_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, java.io.Serializable, Cloneable, Comparable { + 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new PresetNetRuleStandardSchemeFactory()); + schemes.put(TupleScheme.class, new PresetNetRuleTupleSchemeFactory()); + } + + public int ruleId; // required + public String displayName; // required + public List 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 byName = new HashMap(); + + 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 netRules) + { + this(); + this.ruleId = ruleId; + setRuleIdIsSet(true); + this.displayName = displayName; + this.netRules = netRules; + } + + /** + * Performs a deep copy on other. + */ + public PresetNetRule(PresetNetRule other) { + __isset_bitfield = other.__isset_bitfield; + this.ruleId = other.ruleId; + if (other.isSetDisplayName()) { + this.displayName = other.displayName; + } + if (other.isSetNetRules()) { + List __this__netRules = new ArrayList(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 getNetRulesIterator() { + return (this.netRules == null) ? null : this.netRules.iterator(); + } + + public void addToNetRules(NetRule elem) { + if (this.netRules == null) { + this.netRules = new ArrayList(); + } + this.netRules.add(elem); + } + + public List getNetRules() { + return this.netRules; + } + + public PresetNetRule setNetRules(List 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)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 list = new ArrayList(); + + 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 { + + 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(_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 { + + @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(_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 osIds, } +struct PresetNetRule { + 1: i32 ruleId, + 2: string displayName, + 3: list netRules, +} + struct PredefinedData { 1: list netShares, 2: list ldapFilter, 3: list runScripts, + 4: list 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 networkShares, 22: optional list ldapFilters, 23: optional list presetScriptIds, + 24: optional list presetNetworkExceptionIds, } struct LectureSummary { @@ -355,10 +363,11 @@ struct LectureRead { 27: bool limitToAllowedUsers, 28: bool hasUsbAccess, 29: optional list networkShares, - 32: optional list presetNetworkShares, 30: optional list ldapFilters, - 33: optional list presetLdapFilters, 31: optional list presetScriptIds, + 32: optional list presetNetworkShares, + 33: optional list presetLdapFilters, + 34: optional list presetNetworkExceptionIds, } struct MasterTag { -- cgit v1.2.3-55-g7522