From 746af5d07d2b7745618eb75ef3757d150ab02042 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 17 Dec 2021 17:03:51 +0100
Subject: Update generated Thrift API to version 0.15.0
---
pom.xml | 2 +-
.../bwlp/thrift/iface/AuthorizationError.java | 8 +-
.../bwlp/thrift/iface/ClientSessionData.java | 202 +-
.../openslx/bwlp/thrift/iface/DateParamError.java | 8 +-
.../openslx/bwlp/thrift/iface/ImageBaseWrite.java | 313 +-
.../bwlp/thrift/iface/ImageDetailsRead.java | 467 +-
.../bwlp/thrift/iface/ImagePermissions.java | 173 +-
.../bwlp/thrift/iface/ImagePublishData.java | 442 +-
.../bwlp/thrift/iface/ImageSummaryRead.java | 525 +-
.../bwlp/thrift/iface/ImageVersionDetails.java | 286 +-
.../bwlp/thrift/iface/ImageVersionWrite.java | 128 +-
.../openslx/bwlp/thrift/iface/InvocationError.java | 8 +-
.../org/openslx/bwlp/thrift/iface/LdapFilter.java | 188 +-
.../bwlp/thrift/iface/LecturePermissions.java | 143 +-
.../org/openslx/bwlp/thrift/iface/LectureRead.java | 1152 +-
.../openslx/bwlp/thrift/iface/LectureSummary.java | 454 +-
.../openslx/bwlp/thrift/iface/LectureWrite.java | 919 +-
.../org/openslx/bwlp/thrift/iface/Location.java | 163 +-
.../openslx/bwlp/thrift/iface/MasterServer.java | 8010 +++++-----
.../openslx/bwlp/thrift/iface/MasterSoftware.java | 163 +-
.../org/openslx/bwlp/thrift/iface/MasterTag.java | 148 +-
.../openslx/bwlp/thrift/iface/NetDirection.java | 8 +-
.../org/openslx/bwlp/thrift/iface/NetRule.java | 162 +-
.../org/openslx/bwlp/thrift/iface/NetShare.java | 252 +-
.../openslx/bwlp/thrift/iface/NetShareAuth.java | 8 +-
.../openslx/bwlp/thrift/iface/OperatingSystem.java | 242 +-
.../openslx/bwlp/thrift/iface/Organization.java | 216 +-
.../openslx/bwlp/thrift/iface/PredefinedData.java | 253 +-
.../openslx/bwlp/thrift/iface/PresetNetRule.java | 183 +-
.../openslx/bwlp/thrift/iface/PresetRunScript.java | 181 +-
.../java/org/openslx/bwlp/thrift/iface/Role.java | 8 +-
.../org/openslx/bwlp/thrift/iface/Satellite.java | 201 +-
.../openslx/bwlp/thrift/iface/SatelliteConfig.java | 309 +-
.../openslx/bwlp/thrift/iface/SatelliteServer.java | 15462 ++++++++++---------
.../openslx/bwlp/thrift/iface/SatelliteStatus.java | 143 +-
.../bwlp/thrift/iface/SatelliteUserConfig.java | 128 +-
.../bwlp/thrift/iface/ServerSessionData.java | 133 +-
.../org/openslx/bwlp/thrift/iface/SessionData.java | 173 +-
.../org/openslx/bwlp/thrift/iface/ShareMode.java | 8 +-
.../org/openslx/bwlp/thrift/iface/SscMode.java | 8 +-
.../bwlp/thrift/iface/TAuthorizationException.java | 149 +-
.../bwlp/thrift/iface/TInvalidDateParam.java | 149 +-
.../bwlp/thrift/iface/TInvalidTokenException.java | 111 +-
.../bwlp/thrift/iface/TInvocationException.java | 149 +-
.../bwlp/thrift/iface/TNotFoundException.java | 135 +-
.../thrift/iface/TTransferRejectedException.java | 135 +-
.../bwlp/thrift/iface/TransferInformation.java | 245 +-
.../openslx/bwlp/thrift/iface/TransferState.java | 8 +-
.../openslx/bwlp/thrift/iface/TransferStatus.java | 152 +-
.../openslx/bwlp/thrift/iface/UploadOptions.java | 128 +-
.../org/openslx/bwlp/thrift/iface/UserInfo.java | 227 +-
.../org/openslx/bwlp/thrift/iface/Virtualizer.java | 153 +-
.../org/openslx/bwlp/thrift/iface/WhoamiInfo.java | 157 +-
.../org/openslx/thrifthelper/ThriftManager.java | 2 +-
54 files changed, 17015 insertions(+), 16865 deletions(-)
diff --git a/pom.xml b/pom.xml
index ed067a1..8d87bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
org.apache.thrift
libthrift
- 0.9.3
+ 0.15.0
compile
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java b/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
index cacc3d8..d39865e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,10 +7,7 @@
package org.openslx.bwlp.thrift.iface;
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
public enum AuthorizationError implements org.apache.thrift.TEnum {
GENERIC_ERROR(0),
NOT_AUTHENTICATED(1),
@@ -41,6 +38,7 @@ public enum AuthorizationError implements org.apache.thrift.TEnum {
* Find a the enum type by its integer value, as defined in the Thrift IDL.
* @return null if the value is not found.
*/
+ @org.apache.thrift.annotation.Nullable
public static AuthorizationError findByValue(int value) {
switch (value) {
case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
index 715ff3a..5b40cd0 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
@@ -1,40 +1,13 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
*
* 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 = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
public class ClientSessionData 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("ClientSessionData");
@@ -43,16 +16,13 @@ public class ClientSessionData implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ClientSessionDataStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ClientSessionDataTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ClientSessionDataStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ClientSessionDataTupleSchemeFactory();
- public String sessionId; // required
- public String authToken; // required
- public List satellites; // required
- public UserInfo userInfo; // required
+ public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+ public @org.apache.thrift.annotation.Nullable java.lang.String authToken; // required
+ public @org.apache.thrift.annotation.Nullable java.util.List satellites; // required
+ public @org.apache.thrift.annotation.Nullable UserInfo userInfo; // 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 {
@@ -61,10 +31,10 @@ public class ClientSessionData implements org.apache.thrift.TBase byName = new HashMap();
+ private static final java.util.Map byName = new java.util.HashMap();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -72,6 +42,7 @@ public class ClientSessionData implements org.apache.thrift.TBase metaDataMap;
+ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token")));
tmpMap.put(_Fields.AUTH_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authToken", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -134,7 +106,7 @@ public class ClientSessionData implements org.apache.thrift.TBase satellites,
+ java.lang.String sessionId,
+ java.lang.String authToken,
+ java.util.List satellites,
UserInfo userInfo)
{
this();
@@ -165,7 +137,7 @@ public class ClientSessionData implements org.apache.thrift.TBase __this__satellites = new ArrayList(other.satellites.size());
+ java.util.List __this__satellites = new java.util.ArrayList(other.satellites.size());
for (Satellite other_element : other.satellites) {
__this__satellites.add(new Satellite(other_element));
}
@@ -188,11 +160,12 @@ public class ClientSessionData implements org.apache.thrift.TBase getSatellitesIterator() {
return (this.satellites == null) ? null : this.satellites.iterator();
}
public void addToSatellites(Satellite elem) {
if (this.satellites == null) {
- this.satellites = new ArrayList();
+ this.satellites = new java.util.ArrayList();
}
this.satellites.add(elem);
}
- public List getSatellites() {
+ @org.apache.thrift.annotation.Nullable
+ public java.util.List getSatellites() {
return this.satellites;
}
- public ClientSessionData setSatellites(List satellites) {
+ public ClientSessionData setSatellites(@org.apache.thrift.annotation.Nullable java.util.List satellites) {
this.satellites = satellites;
return this;
}
@@ -275,11 +251,12 @@ public class ClientSessionData implements org.apache.thrift.TBase)value);
+ setSatellites((java.util.List)value);
}
break;
@@ -336,7 +313,8 @@ public class ClientSessionData implements org.apache.thrift.TBase list = new ArrayList