summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-12-08 16:20:13 +0100
committerSimon Rettberg2018-12-08 16:20:13 +0100
commite496880dbb052324f1857a4084bca84ff1dc7aa0 (patch)
tree9f79f6add22b2a64773190986864e4c9b225c4d0
parentUpdate to RPC version 5, break compat (diff)
downloadmaster-sync-shared-e496880dbb052324f1857a4084bca84ff1dc7aa0.tar.gz
master-sync-shared-e496880dbb052324f1857a4084bca84ff1dc7aa0.tar.xz
master-sync-shared-e496880dbb052324f1857a4084bca84ff1dc7aa0.zip
Thrift: Add PresetRunScript
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java370
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java402
-rw-r--r--src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java241
-rw-r--r--src/main/thrift/bwlp.thrift9
4 files changed, 751 insertions, 271 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 1075a49..a60e316 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-06-13")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-08")
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");
@@ -67,6 +67,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
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 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_SCRIPT_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetScriptIds", org.apache.thrift.protocol.TType.LIST, (short)31);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -103,6 +104,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
public boolean hasUsbAccess; // required
public List<NetShare> networkShares; // optional
public List<LdapFilter> ldapFilters; // optional
+ public List<Integer> presetScriptIds; // 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 {
@@ -134,7 +136,8 @@ 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"),
- LDAP_FILTERS((short)30, "ldapFilters");
+ LDAP_FILTERS((short)30, "ldapFilters"),
+ PRESET_SCRIPT_IDS((short)31, "presetScriptIds");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -207,6 +210,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
return NETWORK_SHARES;
case 30: // LDAP_FILTERS
return LDAP_FILTERS;
+ case 31: // PRESET_SCRIPT_IDS
+ return PRESET_SCRIPT_IDS;
default:
return null;
}
@@ -261,7 +266,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.LDAP_FILTERS};
+ private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_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);
@@ -329,6 +334,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
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))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureRead.class, metaDataMap);
}
@@ -487,6 +495,10 @@ 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;
+ }
}
public LectureRead deepCopy() {
@@ -537,6 +549,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
this.hasUsbAccess = false;
this.networkShares = null;
this.ldapFilters = null;
+ this.presetScriptIds = null;
}
public String getLectureId() {
@@ -1312,6 +1325,45 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
}
}
+ public int getPresetScriptIdsSize() {
+ return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size();
+ }
+
+ public java.util.Iterator<Integer> getPresetScriptIdsIterator() {
+ return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator();
+ }
+
+ public void addToPresetScriptIds(int elem) {
+ if (this.presetScriptIds == null) {
+ this.presetScriptIds = new ArrayList<Integer>();
+ }
+ this.presetScriptIds.add(elem);
+ }
+
+ public List<Integer> getPresetScriptIds() {
+ return this.presetScriptIds;
+ }
+
+ public LectureRead setPresetScriptIds(List<Integer> presetScriptIds) {
+ this.presetScriptIds = presetScriptIds;
+ return this;
+ }
+
+ public void unsetPresetScriptIds() {
+ this.presetScriptIds = 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 setPresetScriptIdsIsSet(boolean value) {
+ if (!value) {
+ this.presetScriptIds = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case LECTURE_ID:
@@ -1546,6 +1598,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
}
break;
+ case PRESET_SCRIPT_IDS:
+ if (value == null) {
+ unsetPresetScriptIds();
+ } else {
+ setPresetScriptIds((List<Integer>)value);
+ }
+ break;
+
}
}
@@ -1638,6 +1698,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
case LDAP_FILTERS:
return getLdapFilters();
+ case PRESET_SCRIPT_IDS:
+ return getPresetScriptIds();
+
}
throw new IllegalStateException();
}
@@ -1707,6 +1770,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
return isSetNetworkShares();
case LDAP_FILTERS:
return isSetLdapFilters();
+ case PRESET_SCRIPT_IDS:
+ return isSetPresetScriptIds();
}
throw new IllegalStateException();
}
@@ -1985,6 +2050,15 @@ 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;
+ }
+
return true;
}
@@ -2137,6 +2211,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
if (present_ldapFilters)
list.add(ldapFilters);
+ boolean present_presetScriptIds = true && (isSetPresetScriptIds());
+ list.add(present_presetScriptIds);
+ if (present_presetScriptIds)
+ list.add(presetScriptIds);
+
return list.hashCode();
}
@@ -2438,6 +2517,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetPresetScriptIds()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetScriptIds, other.presetScriptIds);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -2643,6 +2732,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
}
first = false;
}
+ if (isSetPresetScriptIds()) {
+ if (!first) sb.append(", ");
+ sb.append("presetScriptIds:");
+ if (this.presetScriptIds == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.presetScriptIds);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -2825,13 +2924,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 _list146 = iprot.readListBegin();
- struct.nics = new ArrayList<String>(_list146.size);
- String _elem147;
- for (int _i148 = 0; _i148 < _list146.size; ++_i148)
+ 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)
{
- _elem147 = iprot.readString();
- struct.nics.add(_elem147);
+ _elem187 = iprot.readString();
+ struct.nics.add(_elem187);
}
iprot.readListEnd();
}
@@ -2843,13 +2942,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 _list149 = iprot.readListBegin();
- struct.allowedUsers = new ArrayList<String>(_list149.size);
- String _elem150;
- for (int _i151 = 0; _i151 < _list149.size; ++_i151)
+ 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)
{
- _elem150 = iprot.readString();
- struct.allowedUsers.add(_elem150);
+ _elem190 = iprot.readString();
+ struct.allowedUsers.add(_elem190);
}
iprot.readListEnd();
}
@@ -2861,14 +2960,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 _list152 = iprot.readListBegin();
- struct.networkExceptions = new ArrayList<NetRule>(_list152.size);
- NetRule _elem153;
- for (int _i154 = 0; _i154 < _list152.size; ++_i154)
+ 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)
{
- _elem153 = new NetRule();
- _elem153.read(iprot);
- struct.networkExceptions.add(_elem153);
+ _elem193 = new NetRule();
+ _elem193.read(iprot);
+ struct.networkExceptions.add(_elem193);
}
iprot.readListEnd();
}
@@ -2914,13 +3013,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 _list155 = iprot.readListBegin();
- struct.locationIds = new ArrayList<Integer>(_list155.size);
- int _elem156;
- for (int _i157 = 0; _i157 < _list155.size; ++_i157)
+ 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)
{
- _elem156 = iprot.readI32();
- struct.locationIds.add(_elem156);
+ _elem196 = iprot.readI32();
+ struct.locationIds.add(_elem196);
}
iprot.readListEnd();
}
@@ -2956,14 +3055,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 _list158 = iprot.readListBegin();
- struct.networkShares = new ArrayList<NetShare>(_list158.size);
- NetShare _elem159;
- for (int _i160 = 0; _i160 < _list158.size; ++_i160)
+ 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)
{
- _elem159 = new NetShare();
- _elem159.read(iprot);
- struct.networkShares.add(_elem159);
+ _elem199 = new NetShare();
+ _elem199.read(iprot);
+ struct.networkShares.add(_elem199);
}
iprot.readListEnd();
}
@@ -2975,14 +3074,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
case 30: // LDAP_FILTERS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list161 = iprot.readListBegin();
- struct.ldapFilters = new ArrayList<LdapFilter>(_list161.size);
- LdapFilter _elem162;
- for (int _i163 = 0; _i163 < _list161.size; ++_i163)
+ org.apache.thrift.protocol.TList _list201 = iprot.readListBegin();
+ struct.ldapFilters = new ArrayList<LdapFilter>(_list201.size);
+ LdapFilter _elem202;
+ for (int _i203 = 0; _i203 < _list201.size; ++_i203)
{
- _elem162 = new LdapFilter();
- _elem162.read(iprot);
- struct.ldapFilters.add(_elem162);
+ _elem202 = new LdapFilter();
+ _elem202.read(iprot);
+ struct.ldapFilters.add(_elem202);
}
iprot.readListEnd();
}
@@ -2991,6 +3090,24 @@ 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
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list204 = iprot.readListBegin();
+ struct.presetScriptIds = new ArrayList<Integer>(_list204.size);
+ int _elem205;
+ for (int _i206 = 0; _i206 < _list204.size; ++_i206)
+ {
+ _elem205 = iprot.readI32();
+ struct.presetScriptIds.add(_elem205);
+ }
+ iprot.readListEnd();
+ }
+ struct.setPresetScriptIdsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -3058,9 +3175,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 _iter164 : struct.nics)
+ for (String _iter207 : struct.nics)
{
- oprot.writeString(_iter164);
+ oprot.writeString(_iter207);
}
oprot.writeListEnd();
}
@@ -3070,9 +3187,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 _iter165 : struct.allowedUsers)
+ for (String _iter208 : struct.allowedUsers)
{
- oprot.writeString(_iter165);
+ oprot.writeString(_iter208);
}
oprot.writeListEnd();
}
@@ -3082,9 +3199,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 _iter166 : struct.networkExceptions)
+ for (NetRule _iter209 : struct.networkExceptions)
{
- _iter166.write(oprot);
+ _iter209.write(oprot);
}
oprot.writeListEnd();
}
@@ -3128,9 +3245,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 _iter167 : struct.locationIds)
+ for (int _iter210 : struct.locationIds)
{
- oprot.writeI32(_iter167);
+ oprot.writeI32(_iter210);
}
oprot.writeListEnd();
}
@@ -3150,9 +3267,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 _iter168 : struct.networkShares)
+ for (NetShare _iter211 : struct.networkShares)
{
- _iter168.write(oprot);
+ _iter211.write(oprot);
}
oprot.writeListEnd();
}
@@ -3164,9 +3281,23 @@ 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 _iter169 : struct.ldapFilters)
+ for (LdapFilter _iter212 : struct.ldapFilters)
{
- _iter169.write(oprot);
+ _iter212.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.presetScriptIds != null) {
+ if (struct.isSetPresetScriptIds()) {
+ 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 _iter213 : struct.presetScriptIds)
+ {
+ oprot.writeI32(_iter213);
}
oprot.writeListEnd();
}
@@ -3278,7 +3409,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
if (struct.isSetLdapFilters()) {
optionals.set(28);
}
- oprot.writeBitSet(optionals, 29);
+ if (struct.isSetPresetScriptIds()) {
+ optionals.set(29);
+ }
+ oprot.writeBitSet(optionals, 30);
if (struct.isSetLectureId()) {
oprot.writeString(struct.lectureId);
}
@@ -3330,27 +3464,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
if (struct.isSetNics()) {
{
oprot.writeI32(struct.nics.size());
- for (String _iter170 : struct.nics)
+ for (String _iter214 : struct.nics)
{
- oprot.writeString(_iter170);
+ oprot.writeString(_iter214);
}
}
}
if (struct.isSetAllowedUsers()) {
{
oprot.writeI32(struct.allowedUsers.size());
- for (String _iter171 : struct.allowedUsers)
+ for (String _iter215 : struct.allowedUsers)
{
- oprot.writeString(_iter171);
+ oprot.writeString(_iter215);
}
}
}
if (struct.isSetNetworkExceptions()) {
{
oprot.writeI32(struct.networkExceptions.size());
- for (NetRule _iter172 : struct.networkExceptions)
+ for (NetRule _iter216 : struct.networkExceptions)
{
- _iter172.write(oprot);
+ _iter216.write(oprot);
}
}
}
@@ -3369,9 +3503,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
if (struct.isSetLocationIds()) {
{
oprot.writeI32(struct.locationIds.size());
- for (int _iter173 : struct.locationIds)
+ for (int _iter217 : struct.locationIds)
{
- oprot.writeI32(_iter173);
+ oprot.writeI32(_iter217);
}
}
}
@@ -3387,18 +3521,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
if (struct.isSetNetworkShares()) {
{
oprot.writeI32(struct.networkShares.size());
- for (NetShare _iter174 : struct.networkShares)
+ for (NetShare _iter218 : struct.networkShares)
{
- _iter174.write(oprot);
+ _iter218.write(oprot);
}
}
}
if (struct.isSetLdapFilters()) {
{
oprot.writeI32(struct.ldapFilters.size());
- for (LdapFilter _iter175 : struct.ldapFilters)
+ for (LdapFilter _iter219 : struct.ldapFilters)
{
- _iter175.write(oprot);
+ _iter219.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetPresetScriptIds()) {
+ {
+ oprot.writeI32(struct.presetScriptIds.size());
+ for (int _iter220 : struct.presetScriptIds)
+ {
+ oprot.writeI32(_iter220);
}
}
}
@@ -3407,7 +3550,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(29);
+ BitSet incoming = iprot.readBitSet(30);
if (incoming.get(0)) {
struct.lectureId = iprot.readString();
struct.setLectureIdIsSet(true);
@@ -3474,40 +3617,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
}
if (incoming.get(16)) {
{
- org.apache.thrift.protocol.TList _list176 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.nics = new ArrayList<String>(_list176.size);
- String _elem177;
- for (int _i178 = 0; _i178 < _list176.size; ++_i178)
+ org.apache.thrift.protocol.TList _list221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.nics = new ArrayList<String>(_list221.size);
+ String _elem222;
+ for (int _i223 = 0; _i223 < _list221.size; ++_i223)
{
- _elem177 = iprot.readString();
- struct.nics.add(_elem177);
+ _elem222 = iprot.readString();
+ struct.nics.add(_elem222);
}
}
struct.setNicsIsSet(true);
}
if (incoming.get(17)) {
{
- org.apache.thrift.protocol.TList _list179 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.allowedUsers = new ArrayList<String>(_list179.size);
- String _elem180;
- for (int _i181 = 0; _i181 < _list179.size; ++_i181)
+ org.apache.thrift.protocol.TList _list224 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.allowedUsers = new ArrayList<String>(_list224.size);
+ String _elem225;
+ for (int _i226 = 0; _i226 < _list224.size; ++_i226)
{
- _elem180 = iprot.readString();
- struct.allowedUsers.add(_elem180);
+ _elem225 = iprot.readString();
+ struct.allowedUsers.add(_elem225);
}
}
struct.setAllowedUsersIsSet(true);
}
if (incoming.get(18)) {
{
- org.apache.thrift.protocol.TList _list182 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.networkExceptions = new ArrayList<NetRule>(_list182.size);
- NetRule _elem183;
- for (int _i184 = 0; _i184 < _list182.size; ++_i184)
+ org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.networkExceptions = new ArrayList<NetRule>(_list227.size);
+ NetRule _elem228;
+ for (int _i229 = 0; _i229 < _list227.size; ++_i229)
{
- _elem183 = new NetRule();
- _elem183.read(iprot);
- struct.networkExceptions.add(_elem183);
+ _elem228 = new NetRule();
+ _elem228.read(iprot);
+ struct.networkExceptions.add(_elem228);
}
}
struct.setNetworkExceptionsIsSet(true);
@@ -3532,13 +3675,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
}
if (incoming.get(23)) {
{
- org.apache.thrift.protocol.TList _list185 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.locationIds = new ArrayList<Integer>(_list185.size);
- int _elem186;
- for (int _i187 = 0; _i187 < _list185.size; ++_i187)
+ org.apache.thrift.protocol.TList _list230 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.locationIds = new ArrayList<Integer>(_list230.size);
+ int _elem231;
+ for (int _i232 = 0; _i232 < _list230.size; ++_i232)
{
- _elem186 = iprot.readI32();
- struct.locationIds.add(_elem186);
+ _elem231 = iprot.readI32();
+ struct.locationIds.add(_elem231);
}
}
struct.setLocationIdsIsSet(true);
@@ -3557,32 +3700,45 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
}
if (incoming.get(27)) {
{
- org.apache.thrift.protocol.TList _list188 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.networkShares = new ArrayList<NetShare>(_list188.size);
- NetShare _elem189;
- for (int _i190 = 0; _i190 < _list188.size; ++_i190)
+ org.apache.thrift.protocol.TList _list233 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.networkShares = new ArrayList<NetShare>(_list233.size);
+ NetShare _elem234;
+ for (int _i235 = 0; _i235 < _list233.size; ++_i235)
{
- _elem189 = new NetShare();
- _elem189.read(iprot);
- struct.networkShares.add(_elem189);
+ _elem234 = new NetShare();
+ _elem234.read(iprot);
+ struct.networkShares.add(_elem234);
}
}
struct.setNetworkSharesIsSet(true);
}
if (incoming.get(28)) {
{
- org.apache.thrift.protocol.TList _list191 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.ldapFilters = new ArrayList<LdapFilter>(_list191.size);
- LdapFilter _elem192;
- for (int _i193 = 0; _i193 < _list191.size; ++_i193)
+ org.apache.thrift.protocol.TList _list236 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.ldapFilters = new ArrayList<LdapFilter>(_list236.size);
+ LdapFilter _elem237;
+ for (int _i238 = 0; _i238 < _list236.size; ++_i238)
{
- _elem192 = new LdapFilter();
- _elem192.read(iprot);
- struct.ldapFilters.add(_elem192);
+ _elem237 = new LdapFilter();
+ _elem237.read(iprot);
+ struct.ldapFilters.add(_elem237);
}
}
struct.setLdapFiltersIsSet(true);
}
+ if (incoming.get(29)) {
+ {
+ org.apache.thrift.protocol.TList _list239 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.presetScriptIds = new ArrayList<Integer>(_list239.size);
+ int _elem240;
+ for (int _i241 = 0; _i241 < _list239.size; ++_i241)
+ {
+ _elem240 = iprot.readI32();
+ struct.presetScriptIds.add(_elem240);
+ }
+ }
+ struct.setPresetScriptIdsIsSet(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 fc0f59d..dfdc415 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-06-13")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-08")
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");
@@ -59,6 +59,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
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)20);
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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -87,6 +88,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
public boolean hasUsbAccess; // required
public List<NetShare> networkShares; // optional
public List<LdapFilter> ldapFilters; // optional
+ public List<Integer> presetScriptIds; // 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 {
@@ -110,7 +112,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
LIMIT_TO_ALLOWED_USERS((short)19, "limitToAllowedUsers"),
HAS_USB_ACCESS((short)20, "hasUsbAccess"),
NETWORK_SHARES((short)21, "networkShares"),
- LDAP_FILTERS((short)22, "ldapFilters");
+ LDAP_FILTERS((short)22, "ldapFilters"),
+ PRESET_SCRIPT_IDS((short)23, "presetScriptIds");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -167,6 +170,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
return NETWORK_SHARES;
case 22: // LDAP_FILTERS
return LDAP_FILTERS;
+ case 23: // PRESET_SCRIPT_IDS
+ return PRESET_SCRIPT_IDS;
default:
return null;
}
@@ -217,7 +222,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};
+ 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};
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);
@@ -270,6 +275,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
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))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureWrite.class, metaDataMap);
}
@@ -389,6 +397,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
this.ldapFilters = __this__ldapFilters;
}
+ if (other.isSetPresetScriptIds()) {
+ List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds);
+ this.presetScriptIds = __this__presetScriptIds;
+ }
}
public LectureWrite deepCopy() {
@@ -427,6 +439,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
this.hasUsbAccess = false;
this.networkShares = null;
this.ldapFilters = null;
+ this.presetScriptIds = null;
}
public String getLectureName() {
@@ -1029,6 +1042,45 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
}
+ public int getPresetScriptIdsSize() {
+ return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size();
+ }
+
+ public java.util.Iterator<Integer> getPresetScriptIdsIterator() {
+ return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator();
+ }
+
+ public void addToPresetScriptIds(int elem) {
+ if (this.presetScriptIds == null) {
+ this.presetScriptIds = new ArrayList<Integer>();
+ }
+ this.presetScriptIds.add(elem);
+ }
+
+ public List<Integer> getPresetScriptIds() {
+ return this.presetScriptIds;
+ }
+
+ public LectureWrite setPresetScriptIds(List<Integer> presetScriptIds) {
+ this.presetScriptIds = presetScriptIds;
+ return this;
+ }
+
+ public void unsetPresetScriptIds() {
+ this.presetScriptIds = 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 setPresetScriptIdsIsSet(boolean value) {
+ if (!value) {
+ this.presetScriptIds = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case LECTURE_NAME:
@@ -1199,6 +1251,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
break;
+ case PRESET_SCRIPT_IDS:
+ if (value == null) {
+ unsetPresetScriptIds();
+ } else {
+ setPresetScriptIds((List<Integer>)value);
+ }
+ break;
+
}
}
@@ -1267,6 +1327,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
case LDAP_FILTERS:
return getLdapFilters();
+ case PRESET_SCRIPT_IDS:
+ return getPresetScriptIds();
+
}
throw new IllegalStateException();
}
@@ -1320,6 +1383,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
return isSetNetworkShares();
case LDAP_FILTERS:
return isSetLdapFilters();
+ case PRESET_SCRIPT_IDS:
+ return isSetPresetScriptIds();
}
throw new IllegalStateException();
}
@@ -1526,6 +1591,15 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
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;
+ }
+
return true;
}
@@ -1638,6 +1712,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
if (present_ldapFilters)
list.add(ldapFilters);
+ boolean present_presetScriptIds = true && (isSetPresetScriptIds());
+ list.add(present_presetScriptIds);
+ if (present_presetScriptIds)
+ list.add(presetScriptIds);
+
return list.hashCode();
}
@@ -1859,6 +1938,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetPresetScriptIds()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.presetScriptIds, other.presetScriptIds);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -2020,6 +2109,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
first = false;
}
+ if (isSetPresetScriptIds()) {
+ if (!first) sb.append(", ");
+ sb.append("presetScriptIds:");
+ if (this.presetScriptIds == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.presetScriptIds);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -2135,13 +2234,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 _list90 = iprot.readListBegin();
- struct.nics = new ArrayList<String>(_list90.size);
- String _elem91;
- for (int _i92 = 0; _i92 < _list90.size; ++_i92)
+ 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)
{
- _elem91 = iprot.readString();
- struct.nics.add(_elem91);
+ _elem123 = iprot.readString();
+ struct.nics.add(_elem123);
}
iprot.readListEnd();
}
@@ -2153,14 +2252,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 _list93 = iprot.readListBegin();
- struct.networkExceptions = new ArrayList<NetRule>(_list93.size);
- NetRule _elem94;
- for (int _i95 = 0; _i95 < _list93.size; ++_i95)
+ 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)
{
- _elem94 = new NetRule();
- _elem94.read(iprot);
- struct.networkExceptions.add(_elem94);
+ _elem126 = new NetRule();
+ _elem126.read(iprot);
+ struct.networkExceptions.add(_elem126);
}
iprot.readListEnd();
}
@@ -2197,13 +2296,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 _list96 = iprot.readListBegin();
- struct.addAllowedUsers = new ArrayList<String>(_list96.size);
- String _elem97;
- for (int _i98 = 0; _i98 < _list96.size; ++_i98)
+ 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)
{
- _elem97 = iprot.readString();
- struct.addAllowedUsers.add(_elem97);
+ _elem129 = iprot.readString();
+ struct.addAllowedUsers.add(_elem129);
}
iprot.readListEnd();
}
@@ -2215,13 +2314,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 _list99 = iprot.readListBegin();
- struct.remAllowedUsers = new ArrayList<String>(_list99.size);
- String _elem100;
- for (int _i101 = 0; _i101 < _list99.size; ++_i101)
+ 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)
{
- _elem100 = iprot.readString();
- struct.remAllowedUsers.add(_elem100);
+ _elem132 = iprot.readString();
+ struct.remAllowedUsers.add(_elem132);
}
iprot.readListEnd();
}
@@ -2233,13 +2332,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 _list102 = iprot.readListBegin();
- struct.locationIds = new ArrayList<Integer>(_list102.size);
- int _elem103;
- for (int _i104 = 0; _i104 < _list102.size; ++_i104)
+ 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)
{
- _elem103 = iprot.readI32();
- struct.locationIds.add(_elem103);
+ _elem135 = iprot.readI32();
+ struct.locationIds.add(_elem135);
}
iprot.readListEnd();
}
@@ -2275,14 +2374,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 _list105 = iprot.readListBegin();
- struct.networkShares = new ArrayList<NetShare>(_list105.size);
- NetShare _elem106;
- for (int _i107 = 0; _i107 < _list105.size; ++_i107)
+ 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)
{
- _elem106 = new NetShare();
- _elem106.read(iprot);
- struct.networkShares.add(_elem106);
+ _elem138 = new NetShare();
+ _elem138.read(iprot);
+ struct.networkShares.add(_elem138);
}
iprot.readListEnd();
}
@@ -2294,14 +2393,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 _list108 = iprot.readListBegin();
- struct.ldapFilters = new ArrayList<LdapFilter>(_list108.size);
- LdapFilter _elem109;
- for (int _i110 = 0; _i110 < _list108.size; ++_i110)
+ 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)
{
- _elem109 = new LdapFilter();
- _elem109.read(iprot);
- struct.ldapFilters.add(_elem109);
+ _elem141 = new LdapFilter();
+ _elem141.read(iprot);
+ struct.ldapFilters.add(_elem141);
}
iprot.readListEnd();
}
@@ -2310,6 +2409,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ 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)
+ {
+ _elem144 = iprot.readI32();
+ struct.presetScriptIds.add(_elem144);
+ }
+ iprot.readListEnd();
+ }
+ struct.setPresetScriptIdsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2361,9 +2478,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 _iter111 : struct.nics)
+ for (String _iter146 : struct.nics)
{
- oprot.writeString(_iter111);
+ oprot.writeString(_iter146);
}
oprot.writeListEnd();
}
@@ -2374,9 +2491,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 _iter112 : struct.addAllowedUsers)
+ for (String _iter147 : struct.addAllowedUsers)
{
- oprot.writeString(_iter112);
+ oprot.writeString(_iter147);
}
oprot.writeListEnd();
}
@@ -2388,9 +2505,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 _iter113 : struct.networkExceptions)
+ for (NetRule _iter148 : struct.networkExceptions)
{
- _iter113.write(oprot);
+ _iter148.write(oprot);
}
oprot.writeListEnd();
}
@@ -2413,9 +2530,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 _iter114 : struct.remAllowedUsers)
+ for (String _iter149 : struct.remAllowedUsers)
{
- oprot.writeString(_iter114);
+ oprot.writeString(_iter149);
}
oprot.writeListEnd();
}
@@ -2426,9 +2543,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 _iter115 : struct.locationIds)
+ for (int _iter150 : struct.locationIds)
{
- oprot.writeI32(_iter115);
+ oprot.writeI32(_iter150);
}
oprot.writeListEnd();
}
@@ -2448,9 +2565,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 _iter116 : struct.networkShares)
+ for (NetShare _iter151 : struct.networkShares)
{
- _iter116.write(oprot);
+ _iter151.write(oprot);
}
oprot.writeListEnd();
}
@@ -2462,9 +2579,23 @@ 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 _iter117 : struct.ldapFilters)
+ for (LdapFilter _iter152 : struct.ldapFilters)
{
- _iter117.write(oprot);
+ _iter152.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.presetScriptIds != null) {
+ if (struct.isSetPresetScriptIds()) {
+ 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)
+ {
+ oprot.writeI32(_iter153);
}
oprot.writeListEnd();
}
@@ -2552,7 +2683,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
if (struct.isSetLdapFilters()) {
optionals.set(20);
}
- oprot.writeBitSet(optionals, 21);
+ if (struct.isSetPresetScriptIds()) {
+ optionals.set(21);
+ }
+ oprot.writeBitSet(optionals, 22);
if (struct.isSetLectureName()) {
oprot.writeString(struct.lectureName);
}
@@ -2580,18 +2714,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
if (struct.isSetNics()) {
{
oprot.writeI32(struct.nics.size());
- for (String _iter118 : struct.nics)
+ for (String _iter154 : struct.nics)
{
- oprot.writeString(_iter118);
+ oprot.writeString(_iter154);
}
}
}
if (struct.isSetNetworkExceptions()) {
{
oprot.writeI32(struct.networkExceptions.size());
- for (NetRule _iter119 : struct.networkExceptions)
+ for (NetRule _iter155 : struct.networkExceptions)
{
- _iter119.write(oprot);
+ _iter155.write(oprot);
}
}
}
@@ -2607,27 +2741,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
if (struct.isSetAddAllowedUsers()) {
{
oprot.writeI32(struct.addAllowedUsers.size());
- for (String _iter120 : struct.addAllowedUsers)
+ for (String _iter156 : struct.addAllowedUsers)
{
- oprot.writeString(_iter120);
+ oprot.writeString(_iter156);
}
}
}
if (struct.isSetRemAllowedUsers()) {
{
oprot.writeI32(struct.remAllowedUsers.size());
- for (String _iter121 : struct.remAllowedUsers)
+ for (String _iter157 : struct.remAllowedUsers)
{
- oprot.writeString(_iter121);
+ oprot.writeString(_iter157);
}
}
}
if (struct.isSetLocationIds()) {
{
oprot.writeI32(struct.locationIds.size());
- for (int _iter122 : struct.locationIds)
+ for (int _iter158 : struct.locationIds)
{
- oprot.writeI32(_iter122);
+ oprot.writeI32(_iter158);
}
}
}
@@ -2643,18 +2777,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
if (struct.isSetNetworkShares()) {
{
oprot.writeI32(struct.networkShares.size());
- for (NetShare _iter123 : struct.networkShares)
+ for (NetShare _iter159 : struct.networkShares)
{
- _iter123.write(oprot);
+ _iter159.write(oprot);
}
}
}
if (struct.isSetLdapFilters()) {
{
oprot.writeI32(struct.ldapFilters.size());
- for (LdapFilter _iter124 : struct.ldapFilters)
+ for (LdapFilter _iter160 : struct.ldapFilters)
{
- _iter124.write(oprot);
+ _iter160.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetPresetScriptIds()) {
+ {
+ oprot.writeI32(struct.presetScriptIds.size());
+ for (int _iter161 : struct.presetScriptIds)
+ {
+ oprot.writeI32(_iter161);
}
}
}
@@ -2663,7 +2806,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(21);
+ BitSet incoming = iprot.readBitSet(22);
if (incoming.get(0)) {
struct.lectureName = iprot.readString();
struct.setLectureNameIsSet(true);
@@ -2698,27 +2841,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
if (incoming.get(8)) {
{
- org.apache.thrift.protocol.TList _list125 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.nics = new ArrayList<String>(_list125.size);
- String _elem126;
- for (int _i127 = 0; _i127 < _list125.size; ++_i127)
+ 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)
{
- _elem126 = iprot.readString();
- struct.nics.add(_elem126);
+ _elem163 = iprot.readString();
+ struct.nics.add(_elem163);
}
}
struct.setNicsIsSet(true);
}
if (incoming.get(9)) {
{
- org.apache.thrift.protocol.TList _list128 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.networkExceptions = new ArrayList<NetRule>(_list128.size);
- NetRule _elem129;
- for (int _i130 = 0; _i130 < _list128.size; ++_i130)
+ 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)
{
- _elem129 = new NetRule();
- _elem129.read(iprot);
- struct.networkExceptions.add(_elem129);
+ _elem166 = new NetRule();
+ _elem166.read(iprot);
+ struct.networkExceptions.add(_elem166);
}
}
struct.setNetworkExceptionsIsSet(true);
@@ -2738,39 +2881,39 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
if (incoming.get(13)) {
{
- org.apache.thrift.protocol.TList _list131 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.addAllowedUsers = new ArrayList<String>(_list131.size);
- String _elem132;
- for (int _i133 = 0; _i133 < _list131.size; ++_i133)
+ 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)
{
- _elem132 = iprot.readString();
- struct.addAllowedUsers.add(_elem132);
+ _elem169 = iprot.readString();
+ struct.addAllowedUsers.add(_elem169);
}
}
struct.setAddAllowedUsersIsSet(true);
}
if (incoming.get(14)) {
{
- org.apache.thrift.protocol.TList _list134 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.remAllowedUsers = new ArrayList<String>(_list134.size);
- String _elem135;
- for (int _i136 = 0; _i136 < _list134.size; ++_i136)
+ 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)
{
- _elem135 = iprot.readString();
- struct.remAllowedUsers.add(_elem135);
+ _elem172 = iprot.readString();
+ struct.remAllowedUsers.add(_elem172);
}
}
struct.setRemAllowedUsersIsSet(true);
}
if (incoming.get(15)) {
{
- org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.locationIds = new ArrayList<Integer>(_list137.size);
- int _elem138;
- for (int _i139 = 0; _i139 < _list137.size; ++_i139)
+ 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)
{
- _elem138 = iprot.readI32();
- struct.locationIds.add(_elem138);
+ _elem175 = iprot.readI32();
+ struct.locationIds.add(_elem175);
}
}
struct.setLocationIdsIsSet(true);
@@ -2789,32 +2932,45 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
}
if (incoming.get(19)) {
{
- org.apache.thrift.protocol.TList _list140 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.networkShares = new ArrayList<NetShare>(_list140.size);
- NetShare _elem141;
- for (int _i142 = 0; _i142 < _list140.size; ++_i142)
+ 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)
{
- _elem141 = new NetShare();
- _elem141.read(iprot);
- struct.networkShares.add(_elem141);
+ _elem178 = new NetShare();
+ _elem178.read(iprot);
+ struct.networkShares.add(_elem178);
}
}
struct.setNetworkSharesIsSet(true);
}
if (incoming.get(20)) {
{
- org.apache.thrift.protocol.TList _list143 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.ldapFilters = new ArrayList<LdapFilter>(_list143.size);
- LdapFilter _elem144;
- for (int _i145 = 0; _i145 < _list143.size; ++_i145)
+ 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)
{
- _elem144 = new LdapFilter();
- _elem144.read(iprot);
- struct.ldapFilters.add(_elem144);
+ _elem181 = new LdapFilter();
+ _elem181.read(iprot);
+ struct.ldapFilters.add(_elem181);
}
}
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)
+ {
+ _elem184 = iprot.readI32();
+ struct.presetScriptIds.add(_elem184);
+ }
+ }
+ struct.setPresetScriptIdsIsSet(true);
+ }
}
}
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 67e2463..539fb0e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java
@@ -34,12 +34,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-11-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-08")
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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -49,11 +50,13 @@ 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
/** 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");
+ LDAP_FILTER((short)2, "ldapFilter"),
+ RUN_SCRIPTS((short)3, "runScripts");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -72,6 +75,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
return NET_SHARES;
case 2: // LDAP_FILTER
return LDAP_FILTER;
+ case 3: // RUN_SCRIPTS
+ return RUN_SCRIPTS;
default:
return null;
}
@@ -121,6 +126,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
tmpMap.put(_Fields.LDAP_FILTER, new org.apache.thrift.meta_data.FieldMetaData("ldapFilter", 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, LdapFilter.class))));
+ 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))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PredefinedData.class, metaDataMap);
}
@@ -130,11 +138,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
public PredefinedData(
List<NetShare> netShares,
- List<LdapFilter> ldapFilter)
+ List<LdapFilter> ldapFilter,
+ List<PresetRunScript> runScripts)
{
this();
this.netShares = netShares;
this.ldapFilter = ldapFilter;
+ this.runScripts = runScripts;
}
/**
@@ -155,6 +165,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
}
this.ldapFilter = __this__ldapFilter;
}
+ if (other.isSetRunScripts()) {
+ List<PresetRunScript> __this__runScripts = new ArrayList<PresetRunScript>(other.runScripts.size());
+ for (PresetRunScript other_element : other.runScripts) {
+ __this__runScripts.add(new PresetRunScript(other_element));
+ }
+ this.runScripts = __this__runScripts;
+ }
}
public PredefinedData deepCopy() {
@@ -165,6 +182,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
public void clear() {
this.netShares = null;
this.ldapFilter = null;
+ this.runScripts = null;
}
public int getNetSharesSize() {
@@ -245,6 +263,45 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
}
}
+ public int getRunScriptsSize() {
+ return (this.runScripts == null) ? 0 : this.runScripts.size();
+ }
+
+ public java.util.Iterator<PresetRunScript> getRunScriptsIterator() {
+ return (this.runScripts == null) ? null : this.runScripts.iterator();
+ }
+
+ public void addToRunScripts(PresetRunScript elem) {
+ if (this.runScripts == null) {
+ this.runScripts = new ArrayList<PresetRunScript>();
+ }
+ this.runScripts.add(elem);
+ }
+
+ public List<PresetRunScript> getRunScripts() {
+ return this.runScripts;
+ }
+
+ public PredefinedData setRunScripts(List<PresetRunScript> runScripts) {
+ this.runScripts = runScripts;
+ return this;
+ }
+
+ public void unsetRunScripts() {
+ this.runScripts = null;
+ }
+
+ /** Returns true if field runScripts is set (has been assigned a value) and false otherwise */
+ public boolean isSetRunScripts() {
+ return this.runScripts != null;
+ }
+
+ public void setRunScriptsIsSet(boolean value) {
+ if (!value) {
+ this.runScripts = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case NET_SHARES:
@@ -263,6 +320,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
}
break;
+ case RUN_SCRIPTS:
+ if (value == null) {
+ unsetRunScripts();
+ } else {
+ setRunScripts((List<PresetRunScript>)value);
+ }
+ break;
+
}
}
@@ -274,6 +339,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
case LDAP_FILTER:
return getLdapFilter();
+ case RUN_SCRIPTS:
+ return getRunScripts();
+
}
throw new IllegalStateException();
}
@@ -289,6 +357,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
return isSetNetShares();
case LDAP_FILTER:
return isSetLdapFilter();
+ case RUN_SCRIPTS:
+ return isSetRunScripts();
}
throw new IllegalStateException();
}
@@ -324,6 +394,15 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
return false;
}
+ boolean this_present_runScripts = true && this.isSetRunScripts();
+ boolean that_present_runScripts = true && that.isSetRunScripts();
+ if (this_present_runScripts || that_present_runScripts) {
+ if (!(this_present_runScripts && that_present_runScripts))
+ return false;
+ if (!this.runScripts.equals(that.runScripts))
+ return false;
+ }
+
return true;
}
@@ -341,6 +420,11 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
if (present_ldapFilter)
list.add(ldapFilter);
+ boolean present_runScripts = true && (isSetRunScripts());
+ list.add(present_runScripts);
+ if (present_runScripts)
+ list.add(runScripts);
+
return list.hashCode();
}
@@ -372,6 +456,16 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRunScripts()).compareTo(other.isSetRunScripts());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRunScripts()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.runScripts, other.runScripts);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -407,6 +501,14 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
sb.append(this.ldapFilter);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("runScripts:");
+ if (this.runScripts == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.runScripts);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -453,14 +555,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 _list90 = iprot.readListBegin();
- struct.netShares = new ArrayList<NetShare>(_list90.size);
- NetShare _elem91;
- for (int _i92 = 0; _i92 < _list90.size; ++_i92)
+ 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)
{
- _elem91 = new NetShare();
- _elem91.read(iprot);
- struct.netShares.add(_elem91);
+ _elem99 = new NetShare();
+ _elem99.read(iprot);
+ struct.netShares.add(_elem99);
}
iprot.readListEnd();
}
@@ -472,14 +574,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 _list93 = iprot.readListBegin();
- struct.ldapFilter = new ArrayList<LdapFilter>(_list93.size);
- LdapFilter _elem94;
- for (int _i95 = 0; _i95 < _list93.size; ++_i95)
+ 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)
{
- _elem94 = new LdapFilter();
- _elem94.read(iprot);
- struct.ldapFilter.add(_elem94);
+ _elem102 = new LdapFilter();
+ _elem102.read(iprot);
+ struct.ldapFilter.add(_elem102);
}
iprot.readListEnd();
}
@@ -488,6 +590,25 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ 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)
+ {
+ _elem105 = new PresetRunScript();
+ _elem105.read(iprot);
+ struct.runScripts.add(_elem105);
+ }
+ iprot.readListEnd();
+ }
+ struct.setRunScriptsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -507,9 +628,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 _iter96 : struct.netShares)
+ for (NetShare _iter107 : struct.netShares)
{
- _iter96.write(oprot);
+ _iter107.write(oprot);
}
oprot.writeListEnd();
}
@@ -519,9 +640,21 @@ 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 _iter97 : struct.ldapFilter)
+ for (LdapFilter _iter108 : struct.ldapFilter)
{
- _iter97.write(oprot);
+ _iter108.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.runScripts != null) {
+ 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)
+ {
+ _iter109.write(oprot);
}
oprot.writeListEnd();
}
@@ -551,22 +684,34 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
if (struct.isSetLdapFilter()) {
optionals.set(1);
}
- oprot.writeBitSet(optionals, 2);
+ if (struct.isSetRunScripts()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
if (struct.isSetNetShares()) {
{
oprot.writeI32(struct.netShares.size());
- for (NetShare _iter98 : struct.netShares)
+ for (NetShare _iter110 : struct.netShares)
{
- _iter98.write(oprot);
+ _iter110.write(oprot);
}
}
}
if (struct.isSetLdapFilter()) {
{
oprot.writeI32(struct.ldapFilter.size());
- for (LdapFilter _iter99 : struct.ldapFilter)
+ for (LdapFilter _iter111 : struct.ldapFilter)
+ {
+ _iter111.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetRunScripts()) {
+ {
+ oprot.writeI32(struct.runScripts.size());
+ for (PresetRunScript _iter112 : struct.runScripts)
{
- _iter99.write(oprot);
+ _iter112.write(oprot);
}
}
}
@@ -575,35 +720,49 @@ 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(2);
+ BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list100 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.netShares = new ArrayList<NetShare>(_list100.size);
- NetShare _elem101;
- for (int _i102 = 0; _i102 < _list100.size; ++_i102)
+ 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)
{
- _elem101 = new NetShare();
- _elem101.read(iprot);
- struct.netShares.add(_elem101);
+ _elem114 = new NetShare();
+ _elem114.read(iprot);
+ struct.netShares.add(_elem114);
}
}
struct.setNetSharesIsSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.ldapFilter = new ArrayList<LdapFilter>(_list103.size);
- LdapFilter _elem104;
- for (int _i105 = 0; _i105 < _list103.size; ++_i105)
+ 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)
{
- _elem104 = new LdapFilter();
- _elem104.read(iprot);
- struct.ldapFilter.add(_elem104);
+ _elem117 = new LdapFilter();
+ _elem117.read(iprot);
+ struct.ldapFilter.add(_elem117);
}
}
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)
+ {
+ _elem120 = new PresetRunScript();
+ _elem120.read(iprot);
+ struct.runScripts.add(_elem120);
+ }
+ }
+ struct.setRunScriptsIsSet(true);
+ }
}
}
diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift
index a9a7301..8b7af3f 100644
--- a/src/main/thrift/bwlp.thrift
+++ b/src/main/thrift/bwlp.thrift
@@ -261,9 +261,16 @@ struct LdapFilter {
4: optional string title,
}
+struct PresetRunScript {
+ 1: i32 scriptId,
+ 2: string displayname,
+ 3: list<i32> osIds,
+}
+
struct PredefinedData {
1: list<NetShare> netShares,
2: list<LdapFilter> ldapFilter,
+ 3: list<PresetRunScript> runScripts,
}
// Write lecture to sat. if optional fields are not set or null, their value stays unchanged
@@ -289,6 +296,7 @@ struct LectureWrite {
20: bool hasUsbAccess,
21: optional list<NetShare> networkShares,
22: optional list<LdapFilter> ldapFilters,
+ 23: optional list<i32> presetScriptIds,
}
struct LectureSummary {
@@ -341,6 +349,7 @@ struct LectureRead {
28: bool hasUsbAccess,
29: optional list<NetShare> networkShares,
30: optional list<LdapFilter> ldapFilters,
+ 31: optional list<i32> presetScriptIds,
}
struct MasterTag {