diff options
author | Simon Rettberg | 2014-09-13 17:08:38 +0200 |
---|---|---|
committer | Simon Rettberg | 2014-09-13 17:08:38 +0200 |
commit | 6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b (patch) | |
tree | aece01286494db00433b3678272846829f119260 | |
parent | [client] Add resource loader that will take care of error handling (diff) | |
download | tutor-module-6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b.tar.gz tutor-module-6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b.tar.xz tutor-module-6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b.zip |
Fix server.thrift file (make future-proof by using field ids), move generated thrift classes to own package
27 files changed, 899 insertions, 894 deletions
@@ -4,6 +4,7 @@ .settings/ target/ bin/ +gen-java/ dependency-reduced-pom.xml C:* forms-1.3.0.jar diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index b862b2ce..ecf5b9df 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -40,7 +40,7 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Links; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index 36b4f214..6e5309cb 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -59,7 +59,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -1101,12 +1101,12 @@ public class DeleteImage_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { - List<server.Image> images; + List<server.generated.Image> images; try { // Hole eine Liste der Images images = client.getImageList(); - Iterator<server.Image> i = images.iterator(); + Iterator<server.generated.Image> i = images.iterator(); int x = 0; SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index 21b27239..e4f6e0cf 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -40,7 +40,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 437b8e8f..986b96d7 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -38,7 +38,7 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 8a7fda3f..9b026a59 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -47,7 +47,7 @@ import org.apache.thrift.TException; import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -67,7 +67,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JProgressBar progressBar; String host = SessionData.session.getServerAdress(); int port = 21; - server.User user; + server.generated.User user; String filename = ""; File uploadFile; static String arg = ""; diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index 8cc485b8..eb864d91 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -44,8 +44,8 @@ import org.apache.thrift.TException; import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; -import server.Server.Client; -import server.User; +import server.generated.Server.Client; +import server.generated.User; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index bbfcbd19..6d84f247 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -47,7 +47,7 @@ import org.apache.thrift.TException; import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -67,7 +67,7 @@ public class FTPEditUploader_GUI extends JFrame implements JProgressBar progressBar; String host = SessionData.session.getServerAdress(); int port = 21; - server.User user; + server.generated.User user; String filename = ""; File uploadFile; static String arg = ""; diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index d2e5d39b..db80bc35 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -43,8 +43,8 @@ import org.apache.thrift.TException; import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; -import server.Server.Client; -import server.User; +import server.generated.Server.Client; +import server.generated.User; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 1d886c99..b3b466d6 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -59,7 +59,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; //import models.person; @@ -978,12 +978,12 @@ public class SearchEditImage_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { - List<server.Image> images; + List<server.generated.Image> images; try { // Hole eine Liste der Images images = client.getImageList(); - Iterator<server.Image> i = images.iterator(); + Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index 94f8857e..fedf27df 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -61,7 +61,7 @@ import models.person; import org.apache.thrift.TException;
-import server.Server.Client;
+import server.generated.Server.Client;
import thrift.ThriftConnection;
import util.GuiOrganizer;
import util.OpenLinks;
@@ -887,12 +887,12 @@ public class SearchImage_GUI extends JFrame { // Initiale Beffuelung eines Table models
public DefaultTableModel initTableModel(DefaultTableModel model) {
- List<server.Image> images;
+ List<server.generated.Image> images;
try {
// Hole eine Liste der Images
images = client.getImageList();
- Iterator<server.Image> i = images.iterator();
+ Iterator<server.generated.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index e46c4136..4465ec3a 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -254,7 +254,7 @@ public class Login_GUI extends JFrame { setStatus(Color.black, "Hole Verbindungsdaten von Server...", null); // set connection to bwLehrpoolSuiteServer ThriftConnection bwthrift = new ThriftConnection(); - server.Server.Client bwClient = bwthrift.getThriftConnection(); + server.generated.Server.Client bwClient = bwthrift.getThriftConnection(); models.Client.clientcon.setClient(bwClient); // User-Info diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 9eaca57b..13360e3a 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -56,7 +56,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -942,12 +942,12 @@ public class CreateLectureLink_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException { - List<server.Image> images; + List<server.generated.Image> images; // Hole eine Liste der Images images = client.getImageList(); - Iterator<server.Image> i = images.iterator(); + Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 3c526681..dd6f6048 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -58,7 +58,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -668,11 +668,11 @@ public class DeleteLecture_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException { - List<server.Lecture> lectures; + List<server.generated.Lecture> lectures; try { // Hole eine Liste der Images lectures = client.getLectureList(); - Iterator<server.Lecture> i = lectures.iterator(); + Iterator<server.generated.Lecture> i = lectures.iterator(); SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 9b727c35..35ee0af6 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -57,7 +57,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -947,12 +947,12 @@ public class EditLectureLink_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException { - List<server.Image> images; + List<server.generated.Image> images; // Hole eine Liste der Images images = client.getImageList(); - Iterator<server.Image> i = images.iterator(); + Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index ae8f3bb7..da8ed944 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java @@ -60,7 +60,7 @@ import models.person; import org.apache.thrift.TException; -import server.Server.Client; +import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; import util.OpenLinks; @@ -767,11 +767,11 @@ public class EditLectureSearch_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException { - List<server.Lecture> lectures; + List<server.generated.Lecture> lectures; try { // Hole eine Liste der Images lectures = client.getLectureList(); - Iterator<server.Lecture> i = lectures.iterator(); + Iterator<server.generated.Lecture> i = lectures.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index c34caec0..6c74cfe5 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -56,7 +56,7 @@ import models.person; import org.apache.thrift.TException;
-import server.Server.Client;
+import server.generated.Server.Client;
import thrift.ThriftConnection;
import util.GuiOrganizer;
import util.OpenLinks;
@@ -575,11 +575,11 @@ public class SearchLecture_GUI extends JFrame { // Initiale Beffuelung eines Table models
public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {
- List<server.Lecture> lectures;
+ List<server.generated.Lecture> lectures;
try {
// Hole eine Liste der Images
lectures = client.getLectureList();
- Iterator<server.Lecture> i = lectures.iterator();
+ Iterator<server.generated.Lecture> i = lectures.iterator();
SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
int x = 0;
diff --git a/dozentenmodul/src/main/java/models/Client.java b/dozentenmodul/src/main/java/models/Client.java index 42eccdec..e249127a 100644 --- a/dozentenmodul/src/main/java/models/Client.java +++ b/dozentenmodul/src/main/java/models/Client.java @@ -2,14 +2,14 @@ package models; public class Client { - private server.Server.Client client; + private server.generated.Server.Client client; public static Client clientcon=new Client(); - public server.Server.Client getClient() { + public server.generated.Server.Client getClient() { return client; } - public void setClient(server.Server.Client client) { + public void setClient(server.generated.Server.Client client) { this.client = client; } diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java index 98b15604..a6fe6d53 100644 --- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java +++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java @@ -10,8 +10,8 @@ import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; import org.apache.thrift.transport.TTransportException; -import server.Server; -import server.Server.Client; +import server.generated.Server; +import server.generated.Server.Client; public class ThriftConnection { diff --git a/dozentenmodulserver/src/main/java/server/BinaryListener.java b/dozentenmodulserver/src/main/java/server/BinaryListener.java index ffeb9bd5..b044132e 100644 --- a/dozentenmodulserver/src/main/java/server/BinaryListener.java +++ b/dozentenmodulserver/src/main/java/server/BinaryListener.java @@ -10,6 +10,7 @@ import org.apache.thrift.server.TThreadPoolServer; import org.apache.thrift.transport.TServerSocket; import org.apache.thrift.transport.TServerTransport; import org.apache.thrift.transport.TTransportException; +import server.generated.Server; public class BinaryListener implements Runnable { private static Logger log = Logger.getLogger(BinaryListener.class); diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 35b9579a..6e31bc4c 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -20,6 +20,10 @@ import models.Configuration; import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; import org.apache.thrift.TException; +import server.generated.User; +import server.generated.Image; +import server.generated.Lecture; +import server.generated.Server; import com.mysql.jdbc.StringUtils; diff --git a/dozentenmodulserver/src/main/java/server/Image.java b/dozentenmodulserver/src/main/java/server/generated/Image.java index 16fc1ef5..1c8291f7 100644 --- a/dozentenmodulserver/src/main/java/server/Image.java +++ b/dozentenmodulserver/src/main/java/server/generated/Image.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package server; +package server.generated; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; @@ -35,15 +35,15 @@ import org.slf4j.LoggerFactory; public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, java.io.Serializable, Cloneable, Comparable<Image> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Image"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField IMAGE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imageName", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField LICENSE_RESTRICTION_FIELD_DESC = new org.apache.thrift.protocol.TField("licenseRestriction", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField OS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("osName", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField LECTURE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureName", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField UPDATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updateTime", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField USER_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("userData", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.STRING, (short)-9); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField IMAGE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imageName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField LICENSE_RESTRICTION_FIELD_DESC = new org.apache.thrift.protocol.TField("licenseRestriction", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField OS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("osName", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField LECTURE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureName", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField UPDATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updateTime", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField USER_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("userData", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.STRING, (short)9); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -63,15 +63,15 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"), - VERSION((short)-2, "version"), - IMAGE_NAME((short)-3, "imageName"), - LICENSE_RESTRICTION((short)-4, "licenseRestriction"), - OS_NAME((short)-5, "osName"), - LECTURE_NAME((short)-6, "lectureName"), - UPDATE_TIME((short)-7, "updateTime"), - USER_DATA((short)-8, "userData"), - IS_TEMPLATE((short)-9, "isTemplate"); + ID((short)1, "id"), + VERSION((short)2, "version"), + IMAGE_NAME((short)3, "imageName"), + LICENSE_RESTRICTION((short)4, "licenseRestriction"), + OS_NAME((short)5, "osName"), + LECTURE_NAME((short)6, "lectureName"), + UPDATE_TIME((short)7, "updateTime"), + USER_DATA((short)8, "userData"), + IS_TEMPLATE((short)9, "isTemplate"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -86,23 +86,23 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // ID + case 1: // ID return ID; - case -2: // VERSION + case 2: // VERSION return VERSION; - case -3: // IMAGE_NAME + case 3: // IMAGE_NAME return IMAGE_NAME; - case -4: // LICENSE_RESTRICTION + case 4: // LICENSE_RESTRICTION return LICENSE_RESTRICTION; - case -5: // OS_NAME + case 5: // OS_NAME return OS_NAME; - case -6: // LECTURE_NAME + case 6: // LECTURE_NAME return LECTURE_NAME; - case -7: // UPDATE_TIME + case 7: // UPDATE_TIME return UPDATE_TIME; - case -8: // USER_DATA + case 8: // USER_DATA return USER_DATA; - case -9: // IS_TEMPLATE + case 9: // IS_TEMPLATE return IS_TEMPLATE; default: return null; @@ -934,7 +934,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav break; } switch (schemeField.id) { - case -1: // ID + case 1: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -942,7 +942,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // VERSION + case 2: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -950,7 +950,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // IMAGE_NAME + case 3: // IMAGE_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imageName = iprot.readString(); struct.setImageNameIsSet(true); @@ -958,7 +958,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // LICENSE_RESTRICTION + case 4: // LICENSE_RESTRICTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.licenseRestriction = iprot.readString(); struct.setLicenseRestrictionIsSet(true); @@ -966,7 +966,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // OS_NAME + case 5: // OS_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.osName = iprot.readString(); struct.setOsNameIsSet(true); @@ -974,7 +974,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // LECTURE_NAME + case 6: // LECTURE_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lectureName = iprot.readString(); struct.setLectureNameIsSet(true); @@ -982,7 +982,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // UPDATE_TIME + case 7: // UPDATE_TIME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.updateTime = iprot.readString(); struct.setUpdateTimeIsSet(true); @@ -990,7 +990,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // USER_DATA + case 8: // USER_DATA if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userData = iprot.readString(); struct.setUserDataIsSet(true); @@ -998,7 +998,7 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // IS_TEMPLATE + case 9: // IS_TEMPLATE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.isTemplate = iprot.readString(); struct.setIsTemplateIsSet(true); @@ -1021,24 +1021,24 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.isTemplate != null) { - oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); - oprot.writeString(struct.isTemplate); + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); oprot.writeFieldEnd(); } - if (struct.userData != null) { - oprot.writeFieldBegin(USER_DATA_FIELD_DESC); - oprot.writeString(struct.userData); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); oprot.writeFieldEnd(); } - if (struct.updateTime != null) { - oprot.writeFieldBegin(UPDATE_TIME_FIELD_DESC); - oprot.writeString(struct.updateTime); + if (struct.imageName != null) { + oprot.writeFieldBegin(IMAGE_NAME_FIELD_DESC); + oprot.writeString(struct.imageName); oprot.writeFieldEnd(); } - if (struct.lectureName != null) { - oprot.writeFieldBegin(LECTURE_NAME_FIELD_DESC); - oprot.writeString(struct.lectureName); + if (struct.licenseRestriction != null) { + oprot.writeFieldBegin(LICENSE_RESTRICTION_FIELD_DESC); + oprot.writeString(struct.licenseRestriction); oprot.writeFieldEnd(); } if (struct.osName != null) { @@ -1046,24 +1046,24 @@ public class Image implements org.apache.thrift.TBase<Image, Image._Fields>, jav oprot.writeString(struct.osName); oprot.writeFieldEnd(); } - if (struct.licenseRestriction != null) { - oprot.writeFieldBegin(LICENSE_RESTRICTION_FIELD_DESC); - oprot.writeString(struct.licenseRestriction); + if (struct.lectureName != null) { + oprot.writeFieldBegin(LECTURE_NAME_FIELD_DESC); + oprot.writeString(struct.lectureName); oprot.writeFieldEnd(); } - if (struct.imageName != null) { - oprot.writeFieldBegin(IMAGE_NAME_FIELD_DESC); - oprot.writeString(struct.imageName); + if (struct.updateTime != null) { + oprot.writeFieldBegin(UPDATE_TIME_FIELD_DESC); + oprot.writeString(struct.updateTime); oprot.writeFieldEnd(); } - if (struct.version != null) { - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeString(struct.version); + if (struct.userData != null) { + oprot.writeFieldBegin(USER_DATA_FIELD_DESC); + oprot.writeString(struct.userData); oprot.writeFieldEnd(); } - if (struct.id != null) { - oprot.writeFieldBegin(ID_FIELD_DESC); - oprot.writeString(struct.id); + if (struct.isTemplate != null) { + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeString(struct.isTemplate); oprot.writeFieldEnd(); } oprot.writeFieldStop(); diff --git a/dozentenmodulserver/src/main/java/server/Lecture.java b/dozentenmodulserver/src/main/java/server/generated/Lecture.java index 0c61ad84..7f4e5a06 100644 --- a/dozentenmodulserver/src/main/java/server/Lecture.java +++ b/dozentenmodulserver/src/main/java/server/generated/Lecture.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package server; +package server.generated; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; @@ -35,15 +35,15 @@ import org.slf4j.LoggerFactory; public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields>, java.io.Serializable, Cloneable, Comparable<Lecture> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Lecture"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField LECTURENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lecturename", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField STARTTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("starttime", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField ENDTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("endtime", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField LASTUSED_FIELD_DESC = new org.apache.thrift.protocol.TField("lastused", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)-9); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField LECTURENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lecturename", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField STARTTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("starttime", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField ENDTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("endtime", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField LASTUSED_FIELD_DESC = new org.apache.thrift.protocol.TField("lastused", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)9); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -63,15 +63,15 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"), - LECTURENAME((short)-2, "lecturename"), - IS_ACTIVE((short)-3, "isActive"), - STARTTIME((short)-4, "starttime"), - ENDTIME((short)-5, "endtime"), - LASTUSED((short)-6, "lastused"), - DESC((short)-7, "desc"), - IMAGENAME((short)-8, "imagename"), - USERNAME((short)-9, "username"); + ID((short)1, "id"), + LECTURENAME((short)2, "lecturename"), + IS_ACTIVE((short)3, "isActive"), + STARTTIME((short)4, "starttime"), + ENDTIME((short)5, "endtime"), + LASTUSED((short)6, "lastused"), + DESC((short)7, "desc"), + IMAGENAME((short)8, "imagename"), + USERNAME((short)9, "username"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -86,23 +86,23 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // ID + case 1: // ID return ID; - case -2: // LECTURENAME + case 2: // LECTURENAME return LECTURENAME; - case -3: // IS_ACTIVE + case 3: // IS_ACTIVE return IS_ACTIVE; - case -4: // STARTTIME + case 4: // STARTTIME return STARTTIME; - case -5: // ENDTIME + case 5: // ENDTIME return ENDTIME; - case -6: // LASTUSED + case 6: // LASTUSED return LASTUSED; - case -7: // DESC + case 7: // DESC return DESC; - case -8: // IMAGENAME + case 8: // IMAGENAME return IMAGENAME; - case -9: // USERNAME + case 9: // USERNAME return USERNAME; default: return null; @@ -934,7 +934,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields break; } switch (schemeField.id) { - case -1: // ID + case 1: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -942,7 +942,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // LECTURENAME + case 2: // LECTURENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lecturename = iprot.readString(); struct.setLecturenameIsSet(true); @@ -950,7 +950,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // IS_ACTIVE + case 3: // IS_ACTIVE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.isActive = iprot.readString(); struct.setIsActiveIsSet(true); @@ -958,7 +958,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // STARTTIME + case 4: // STARTTIME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.starttime = iprot.readString(); struct.setStarttimeIsSet(true); @@ -966,7 +966,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // ENDTIME + case 5: // ENDTIME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.endtime = iprot.readString(); struct.setEndtimeIsSet(true); @@ -974,7 +974,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // LASTUSED + case 6: // LASTUSED if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastused = iprot.readString(); struct.setLastusedIsSet(true); @@ -982,7 +982,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // DESC + case 7: // DESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.desc = iprot.readString(); struct.setDescIsSet(true); @@ -990,7 +990,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // IMAGENAME + case 8: // IMAGENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -998,7 +998,7 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // USERNAME + case 9: // USERNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.username = iprot.readString(); struct.setUsernameIsSet(true); @@ -1021,24 +1021,24 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.username != null) { - oprot.writeFieldBegin(USERNAME_FIELD_DESC); - oprot.writeString(struct.username); + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); oprot.writeFieldEnd(); } - if (struct.imagename != null) { - oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); - oprot.writeString(struct.imagename); + if (struct.lecturename != null) { + oprot.writeFieldBegin(LECTURENAME_FIELD_DESC); + oprot.writeString(struct.lecturename); oprot.writeFieldEnd(); } - if (struct.desc != null) { - oprot.writeFieldBegin(DESC_FIELD_DESC); - oprot.writeString(struct.desc); + if (struct.isActive != null) { + oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); + oprot.writeString(struct.isActive); oprot.writeFieldEnd(); } - if (struct.lastused != null) { - oprot.writeFieldBegin(LASTUSED_FIELD_DESC); - oprot.writeString(struct.lastused); + if (struct.starttime != null) { + oprot.writeFieldBegin(STARTTIME_FIELD_DESC); + oprot.writeString(struct.starttime); oprot.writeFieldEnd(); } if (struct.endtime != null) { @@ -1046,24 +1046,24 @@ public class Lecture implements org.apache.thrift.TBase<Lecture, Lecture._Fields oprot.writeString(struct.endtime); oprot.writeFieldEnd(); } - if (struct.starttime != null) { - oprot.writeFieldBegin(STARTTIME_FIELD_DESC); - oprot.writeString(struct.starttime); + if (struct.lastused != null) { + oprot.writeFieldBegin(LASTUSED_FIELD_DESC); + oprot.writeString(struct.lastused); oprot.writeFieldEnd(); } - if (struct.isActive != null) { - oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); - oprot.writeString(struct.isActive); + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); oprot.writeFieldEnd(); } - if (struct.lecturename != null) { - oprot.writeFieldBegin(LECTURENAME_FIELD_DESC); - oprot.writeString(struct.lecturename); + if (struct.imagename != null) { + oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); + oprot.writeString(struct.imagename); oprot.writeFieldEnd(); } - if (struct.id != null) { - oprot.writeFieldBegin(ID_FIELD_DESC); - oprot.writeString(struct.id); + if (struct.username != null) { + oprot.writeFieldBegin(USERNAME_FIELD_DESC); + oprot.writeString(struct.username); oprot.writeFieldEnd(); } oprot.writeFieldStop(); diff --git a/dozentenmodulserver/src/main/java/server/Server.java b/dozentenmodulserver/src/main/java/server/generated/Server.java index ab527168..0a7d99c5 100644 --- a/dozentenmodulserver/src/main/java/server/Server.java +++ b/dozentenmodulserver/src/main/java/server/generated/Server.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package server; +package server.generated; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; @@ -4098,7 +4098,7 @@ public class Server { public static class DeleteFtpUser_args implements org.apache.thrift.TBase<DeleteFtpUser_args, DeleteFtpUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<DeleteFtpUser_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DeleteFtpUser_args"); - private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -4110,7 +4110,7 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER((short)-1, "user"); + USER((short)1, "user"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -4125,7 +4125,7 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // USER + case 1: // USER return USER; default: return null; @@ -4381,7 +4381,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // USER + case 1: // USER if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.user = iprot.readString(); struct.setUserIsSet(true); @@ -4806,8 +4806,8 @@ public class Server { public static class getPathOfImage_args implements org.apache.thrift.TBase<getPathOfImage_args, getPathOfImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPathOfImage_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathOfImage_args"); - private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("image_id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("image_id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -4820,8 +4820,8 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IMAGE_ID((short)-1, "image_id"), - VERSION((short)-2, "version"); + IMAGE_ID((short)1, "image_id"), + VERSION((short)2, "version"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -4836,9 +4836,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // IMAGE_ID + case 1: // IMAGE_ID return IMAGE_ID; - case -2: // VERSION + case 2: // VERSION return VERSION; default: return null; @@ -5166,7 +5166,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // IMAGE_ID + case 1: // IMAGE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.image_id = iprot.readString(); struct.setImage_idIsSet(true); @@ -5174,7 +5174,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // VERSION + case 2: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -5197,16 +5197,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.version != null) { - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeString(struct.version); - oprot.writeFieldEnd(); - } if (struct.image_id != null) { oprot.writeFieldBegin(IMAGE_ID_FIELD_DESC); oprot.writeString(struct.image_id); oprot.writeFieldEnd(); } + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -5614,24 +5614,24 @@ public class Server { public static class writeVLdata_args implements org.apache.thrift.TBase<writeVLdata_args, writeVLdata_args._Fields>, java.io.Serializable, Cloneable, Comparable<writeVLdata_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("writeVLdata_args"); - private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)-9); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-10); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-11); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-12); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-13); - private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-14); - private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-15); - private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-16); - private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-17); - private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)-18); + private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)10); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)11); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)12); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)13); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)14); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)15); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)16); + private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)17); + private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)18); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -5660,24 +5660,24 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IMAGENAME((short)-1, "imagename"), - DESC((short)-2, "desc"), - LOGIN((short)-3, "login"), - FIRSTNAME((short)-4, "firstname"), - LASTNAME((short)-5, "lastname"), - UNIVERSITY((short)-6, "university"), - MAIL((short)-7, "Mail"), - TEL((short)-8, "Tel"), - FAK((short)-9, "Fak"), - LICENSE((short)-10, "license"), - INTERNET((short)-11, "internet"), - RAM((short)-12, "ram"), - CPU((short)-13, "cpu"), - IMAGE_PATH((short)-14, "imagePath"), - IS_TEMPLATE((short)-15, "isTemplate"), - FILESIZE((short)-16, "filesize"), - SHARE_MODE((short)-17, "shareMode"), - OS((short)-18, "os"); + IMAGENAME((short)1, "imagename"), + DESC((short)2, "desc"), + LOGIN((short)3, "login"), + FIRSTNAME((short)4, "firstname"), + LASTNAME((short)5, "lastname"), + UNIVERSITY((short)6, "university"), + MAIL((short)7, "Mail"), + TEL((short)8, "Tel"), + FAK((short)9, "Fak"), + LICENSE((short)10, "license"), + INTERNET((short)11, "internet"), + RAM((short)12, "ram"), + CPU((short)13, "cpu"), + IMAGE_PATH((short)14, "imagePath"), + IS_TEMPLATE((short)15, "isTemplate"), + FILESIZE((short)16, "filesize"), + SHARE_MODE((short)17, "shareMode"), + OS((short)18, "os"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -5692,41 +5692,41 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // IMAGENAME + case 1: // IMAGENAME return IMAGENAME; - case -2: // DESC + case 2: // DESC return DESC; - case -3: // LOGIN + case 3: // LOGIN return LOGIN; - case -4: // FIRSTNAME + case 4: // FIRSTNAME return FIRSTNAME; - case -5: // LASTNAME + case 5: // LASTNAME return LASTNAME; - case -6: // UNIVERSITY + case 6: // UNIVERSITY return UNIVERSITY; - case -7: // MAIL + case 7: // MAIL return MAIL; - case -8: // TEL + case 8: // TEL return TEL; - case -9: // FAK + case 9: // FAK return FAK; - case -10: // LICENSE + case 10: // LICENSE return LICENSE; - case -11: // INTERNET + case 11: // INTERNET return INTERNET; - case -12: // RAM + case 12: // RAM return RAM; - case -13: // CPU + case 13: // CPU return CPU; - case -14: // IMAGE_PATH + case 14: // IMAGE_PATH return IMAGE_PATH; - case -15: // IS_TEMPLATE + case 15: // IS_TEMPLATE return IS_TEMPLATE; - case -16: // FILESIZE + case 16: // FILESIZE return FILESIZE; - case -17: // SHARE_MODE + case 17: // SHARE_MODE return SHARE_MODE; - case -18: // OS + case 18: // OS return OS; default: return null; @@ -7182,7 +7182,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // IMAGENAME + case 1: // IMAGENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -7190,7 +7190,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // DESC + case 2: // DESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.desc = iprot.readString(); struct.setDescIsSet(true); @@ -7198,7 +7198,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LOGIN + case 3: // LOGIN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.login = iprot.readString(); struct.setLoginIsSet(true); @@ -7206,7 +7206,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // FIRSTNAME + case 4: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -7214,7 +7214,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // LASTNAME + case 5: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -7222,7 +7222,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // UNIVERSITY + case 6: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -7230,7 +7230,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // MAIL + case 7: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -7238,7 +7238,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // TEL + case 8: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -7246,7 +7246,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // FAK + case 9: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -7254,7 +7254,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // LICENSE + case 10: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -7262,7 +7262,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // INTERNET + case 11: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -7270,7 +7270,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // RAM + case 12: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -7278,7 +7278,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // CPU + case 13: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -7286,7 +7286,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -14: // IMAGE_PATH + case 14: // IMAGE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); @@ -7294,7 +7294,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -15: // IS_TEMPLATE + case 15: // IS_TEMPLATE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); @@ -7302,7 +7302,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -16: // FILESIZE + case 16: // FILESIZE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); @@ -7310,7 +7310,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -17: // SHARE_MODE + case 17: // SHARE_MODE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); @@ -7318,7 +7318,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -18: // OS + case 18: // OS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.os = iprot.readString(); struct.setOsIsSet(true); @@ -7341,50 +7341,29 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.os != null) { - oprot.writeFieldBegin(OS_FIELD_DESC); - oprot.writeString(struct.os); + if (struct.imagename != null) { + oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); + oprot.writeString(struct.imagename); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(SHARE_MODE_FIELD_DESC); - oprot.writeI64(struct.shareMode); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(FILESIZE_FIELD_DESC); - oprot.writeI64(struct.filesize); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); - oprot.writeBool(struct.isTemplate); - oprot.writeFieldEnd(); - if (struct.imagePath != null) { - oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); - oprot.writeString(struct.imagePath); + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(CPU_FIELD_DESC); - oprot.writeI64(struct.cpu); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(RAM_FIELD_DESC); - oprot.writeI64(struct.ram); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(INTERNET_FIELD_DESC); - oprot.writeBool(struct.internet); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(LICENSE_FIELD_DESC); - oprot.writeBool(struct.license); - oprot.writeFieldEnd(); - if (struct.Fak != null) { - oprot.writeFieldBegin(FAK_FIELD_DESC); - oprot.writeString(struct.Fak); + if (struct.login != null) { + oprot.writeFieldBegin(LOGIN_FIELD_DESC); + oprot.writeString(struct.login); oprot.writeFieldEnd(); } - if (struct.Tel != null) { - oprot.writeFieldBegin(TEL_FIELD_DESC); - oprot.writeString(struct.Tel); + if (struct.firstname != null) { + oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); + oprot.writeString(struct.firstname); oprot.writeFieldEnd(); } - if (struct.Mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.Mail); + if (struct.lastname != null) { + oprot.writeFieldBegin(LASTNAME_FIELD_DESC); + oprot.writeString(struct.lastname); oprot.writeFieldEnd(); } if (struct.university != null) { @@ -7392,29 +7371,50 @@ public class Server { oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); + if (struct.Mail != null) { + oprot.writeFieldBegin(MAIL_FIELD_DESC); + oprot.writeString(struct.Mail); oprot.writeFieldEnd(); } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); + if (struct.Tel != null) { + oprot.writeFieldBegin(TEL_FIELD_DESC); + oprot.writeString(struct.Tel); oprot.writeFieldEnd(); } - if (struct.login != null) { - oprot.writeFieldBegin(LOGIN_FIELD_DESC); - oprot.writeString(struct.login); + if (struct.Fak != null) { + oprot.writeFieldBegin(FAK_FIELD_DESC); + oprot.writeString(struct.Fak); oprot.writeFieldEnd(); } - if (struct.desc != null) { - oprot.writeFieldBegin(DESC_FIELD_DESC); - oprot.writeString(struct.desc); + oprot.writeFieldBegin(LICENSE_FIELD_DESC); + oprot.writeBool(struct.license); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(INTERNET_FIELD_DESC); + oprot.writeBool(struct.internet); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(RAM_FIELD_DESC); + oprot.writeI64(struct.ram); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(CPU_FIELD_DESC); + oprot.writeI64(struct.cpu); + oprot.writeFieldEnd(); + if (struct.imagePath != null) { + oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); + oprot.writeString(struct.imagePath); oprot.writeFieldEnd(); } - if (struct.imagename != null) { - oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); - oprot.writeString(struct.imagename); + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeBool(struct.isTemplate); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(FILESIZE_FIELD_DESC); + oprot.writeI64(struct.filesize); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(SHARE_MODE_FIELD_DESC); + oprot.writeI64(struct.shareMode); + oprot.writeFieldEnd(); + if (struct.os != null) { + oprot.writeFieldBegin(OS_FIELD_DESC); + oprot.writeString(struct.os); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -10590,8 +10590,8 @@ public class Server { public static class getPersonData_args implements org.apache.thrift.TBase<getPersonData_args, getPersonData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPersonData_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPersonData_args"); - private static final org.apache.thrift.protocol.TField VORNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("Vorname", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField NACHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("Nachname", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField VORNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("Vorname", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField NACHNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("Nachname", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -10604,8 +10604,8 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - VORNAME((short)-1, "Vorname"), - NACHNAME((short)-2, "Nachname"); + VORNAME((short)1, "Vorname"), + NACHNAME((short)2, "Nachname"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -10620,9 +10620,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // VORNAME + case 1: // VORNAME return VORNAME; - case -2: // NACHNAME + case 2: // NACHNAME return NACHNAME; default: return null; @@ -10950,7 +10950,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // VORNAME + case 1: // VORNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Vorname = iprot.readString(); struct.setVornameIsSet(true); @@ -10958,7 +10958,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // NACHNAME + case 2: // NACHNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Nachname = iprot.readString(); struct.setNachnameIsSet(true); @@ -10981,16 +10981,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.Nachname != null) { - oprot.writeFieldBegin(NACHNAME_FIELD_DESC); - oprot.writeString(struct.Nachname); - oprot.writeFieldEnd(); - } if (struct.Vorname != null) { oprot.writeFieldBegin(VORNAME_FIELD_DESC); oprot.writeString(struct.Vorname); oprot.writeFieldEnd(); } + if (struct.Nachname != null) { + oprot.writeFieldBegin(NACHNAME_FIELD_DESC); + oprot.writeString(struct.Nachname); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -11450,20 +11450,20 @@ public class Server { public static class writeLecturedata_args implements org.apache.thrift.TBase<writeLecturedata_args, writeLecturedata_args._Fields>, java.io.Serializable, Cloneable, Comparable<writeLecturedata_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("writeLecturedata_args"); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField SHORTDESC_FIELD_DESC = new org.apache.thrift.protocol.TField("shortdesc", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField END_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("endDate", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.BOOL, (short)-6); - private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)-9); - private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)-10); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-11); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)-12); - private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)-13); - private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)-14); + private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField SHORTDESC_FIELD_DESC = new org.apache.thrift.protocol.TField("shortdesc", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField END_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("endDate", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.BOOL, (short)6); + private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)12); + private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)13); + private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)14); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -11488,20 +11488,20 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NAME((short)-1, "name"), - SHORTDESC((short)-2, "shortdesc"), - DESC((short)-3, "desc"), - START_DATE((short)-4, "startDate"), - END_DATE((short)-5, "endDate"), - IS_ACTIVE((short)-6, "isActive"), - IMAGENAME((short)-7, "imagename"), - LOGIN((short)-8, "login"), - FIRSTNAME((short)-9, "firstname"), - LASTNAME((short)-10, "lastname"), - UNIVERSITY((short)-11, "university"), - MAIL((short)-12, "Mail"), - TEL((short)-13, "Tel"), - FAK((short)-14, "Fak"); + NAME((short)1, "name"), + SHORTDESC((short)2, "shortdesc"), + DESC((short)3, "desc"), + START_DATE((short)4, "startDate"), + END_DATE((short)5, "endDate"), + IS_ACTIVE((short)6, "isActive"), + IMAGENAME((short)7, "imagename"), + LOGIN((short)8, "login"), + FIRSTNAME((short)9, "firstname"), + LASTNAME((short)10, "lastname"), + UNIVERSITY((short)11, "university"), + MAIL((short)12, "Mail"), + TEL((short)13, "Tel"), + FAK((short)14, "Fak"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -11516,33 +11516,33 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // NAME + case 1: // NAME return NAME; - case -2: // SHORTDESC + case 2: // SHORTDESC return SHORTDESC; - case -3: // DESC + case 3: // DESC return DESC; - case -4: // START_DATE + case 4: // START_DATE return START_DATE; - case -5: // END_DATE + case 5: // END_DATE return END_DATE; - case -6: // IS_ACTIVE + case 6: // IS_ACTIVE return IS_ACTIVE; - case -7: // IMAGENAME + case 7: // IMAGENAME return IMAGENAME; - case -8: // LOGIN + case 8: // LOGIN return LOGIN; - case -9: // FIRSTNAME + case 9: // FIRSTNAME return FIRSTNAME; - case -10: // LASTNAME + case 10: // LASTNAME return LASTNAME; - case -11: // UNIVERSITY + case 11: // UNIVERSITY return UNIVERSITY; - case -12: // MAIL + case 12: // MAIL return MAIL; - case -13: // TEL + case 13: // TEL return TEL; - case -14: // FAK + case 14: // FAK return FAK; default: return null; @@ -12734,7 +12734,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // NAME + case 1: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -12742,7 +12742,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // SHORTDESC + case 2: // SHORTDESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.shortdesc = iprot.readString(); struct.setShortdescIsSet(true); @@ -12750,7 +12750,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // DESC + case 3: // DESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.desc = iprot.readString(); struct.setDescIsSet(true); @@ -12758,7 +12758,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // START_DATE + case 4: // START_DATE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.startDate = iprot.readString(); struct.setStartDateIsSet(true); @@ -12766,7 +12766,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // END_DATE + case 5: // END_DATE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.endDate = iprot.readString(); struct.setEndDateIsSet(true); @@ -12774,7 +12774,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // IS_ACTIVE + case 6: // IS_ACTIVE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isActive = iprot.readBool(); struct.setIsActiveIsSet(true); @@ -12782,7 +12782,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // IMAGENAME + case 7: // IMAGENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -12790,7 +12790,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // LOGIN + case 8: // LOGIN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.login = iprot.readString(); struct.setLoginIsSet(true); @@ -12798,7 +12798,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // FIRSTNAME + case 9: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -12806,7 +12806,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // LASTNAME + case 10: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -12814,7 +12814,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // UNIVERSITY + case 11: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -12822,7 +12822,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // MAIL + case 12: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -12830,7 +12830,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // TEL + case 13: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -12838,7 +12838,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -14: // FAK + case 14: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -12861,34 +12861,37 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.Fak != null) { - oprot.writeFieldBegin(FAK_FIELD_DESC); - oprot.writeString(struct.Fak); + if (struct.name != null) { + oprot.writeFieldBegin(NAME_FIELD_DESC); + oprot.writeString(struct.name); oprot.writeFieldEnd(); } - if (struct.Tel != null) { - oprot.writeFieldBegin(TEL_FIELD_DESC); - oprot.writeString(struct.Tel); + if (struct.shortdesc != null) { + oprot.writeFieldBegin(SHORTDESC_FIELD_DESC); + oprot.writeString(struct.shortdesc); oprot.writeFieldEnd(); } - if (struct.Mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.Mail); + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); oprot.writeFieldEnd(); } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); + if (struct.startDate != null) { + oprot.writeFieldBegin(START_DATE_FIELD_DESC); + oprot.writeString(struct.startDate); oprot.writeFieldEnd(); } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); + if (struct.endDate != null) { + oprot.writeFieldBegin(END_DATE_FIELD_DESC); + oprot.writeString(struct.endDate); oprot.writeFieldEnd(); } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); + oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); + oprot.writeBool(struct.isActive); + oprot.writeFieldEnd(); + if (struct.imagename != null) { + oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); + oprot.writeString(struct.imagename); oprot.writeFieldEnd(); } if (struct.login != null) { @@ -12896,37 +12899,34 @@ public class Server { oprot.writeString(struct.login); oprot.writeFieldEnd(); } - if (struct.imagename != null) { - oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); - oprot.writeString(struct.imagename); + if (struct.firstname != null) { + oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); + oprot.writeString(struct.firstname); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); - oprot.writeBool(struct.isActive); - oprot.writeFieldEnd(); - if (struct.endDate != null) { - oprot.writeFieldBegin(END_DATE_FIELD_DESC); - oprot.writeString(struct.endDate); + if (struct.lastname != null) { + oprot.writeFieldBegin(LASTNAME_FIELD_DESC); + oprot.writeString(struct.lastname); oprot.writeFieldEnd(); } - if (struct.startDate != null) { - oprot.writeFieldBegin(START_DATE_FIELD_DESC); - oprot.writeString(struct.startDate); + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.desc != null) { - oprot.writeFieldBegin(DESC_FIELD_DESC); - oprot.writeString(struct.desc); + if (struct.Mail != null) { + oprot.writeFieldBegin(MAIL_FIELD_DESC); + oprot.writeString(struct.Mail); oprot.writeFieldEnd(); } - if (struct.shortdesc != null) { - oprot.writeFieldBegin(SHORTDESC_FIELD_DESC); - oprot.writeString(struct.shortdesc); + if (struct.Tel != null) { + oprot.writeFieldBegin(TEL_FIELD_DESC); + oprot.writeString(struct.Tel); oprot.writeFieldEnd(); } - if (struct.name != null) { - oprot.writeFieldBegin(NAME_FIELD_DESC); - oprot.writeString(struct.name); + if (struct.Fak != null) { + oprot.writeFieldBegin(FAK_FIELD_DESC); + oprot.writeString(struct.Fak); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -13456,7 +13456,7 @@ public class Server { public static class startFileCopy_args implements org.apache.thrift.TBase<startFileCopy_args, startFileCopy_args._Fields>, java.io.Serializable, Cloneable, Comparable<startFileCopy_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startFileCopy_args"); - private static final org.apache.thrift.protocol.TField FILE_FIELD_DESC = new org.apache.thrift.protocol.TField("file", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField FILE_FIELD_DESC = new org.apache.thrift.protocol.TField("file", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -13468,7 +13468,7 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - FILE((short)-1, "file"); + FILE((short)1, "file"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -13483,7 +13483,7 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // FILE + case 1: // FILE return FILE; default: return null; @@ -13739,7 +13739,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // FILE + case 1: // FILE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.file = iprot.readString(); struct.setFileIsSet(true); @@ -14164,8 +14164,8 @@ public class Server { public static class getImageData_args implements org.apache.thrift.TBase<getImageData_args, getImageData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageData_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageData_args"); - private static final org.apache.thrift.protocol.TField IMAGEID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageid", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField IMAGEVERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageversion", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField IMAGEID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageid", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField IMAGEVERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageversion", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -14178,8 +14178,8 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IMAGEID((short)-1, "imageid"), - IMAGEVERSION((short)-2, "imageversion"); + IMAGEID((short)1, "imageid"), + IMAGEVERSION((short)2, "imageversion"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -14194,9 +14194,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // IMAGEID + case 1: // IMAGEID return IMAGEID; - case -2: // IMAGEVERSION + case 2: // IMAGEVERSION return IMAGEVERSION; default: return null; @@ -14524,7 +14524,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // IMAGEID + case 1: // IMAGEID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imageid = iprot.readString(); struct.setImageidIsSet(true); @@ -14532,7 +14532,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // IMAGEVERSION + case 2: // IMAGEVERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imageversion = iprot.readString(); struct.setImageversionIsSet(true); @@ -14555,16 +14555,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.imageversion != null) { - oprot.writeFieldBegin(IMAGEVERSION_FIELD_DESC); - oprot.writeString(struct.imageversion); - oprot.writeFieldEnd(); - } if (struct.imageid != null) { oprot.writeFieldBegin(IMAGEID_FIELD_DESC); oprot.writeString(struct.imageid); oprot.writeFieldEnd(); } + if (struct.imageversion != null) { + oprot.writeFieldBegin(IMAGEVERSION_FIELD_DESC); + oprot.writeString(struct.imageversion); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -15024,7 +15024,7 @@ public class Server { public static class getLectureData_args implements org.apache.thrift.TBase<getLectureData_args, getLectureData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureData_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLectureData_args"); - private static final org.apache.thrift.protocol.TField LECTUREID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureid", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField LECTUREID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureid", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -15036,7 +15036,7 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - LECTUREID((short)-1, "lectureid"); + LECTUREID((short)1, "lectureid"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -15051,7 +15051,7 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // LECTUREID + case 1: // LECTUREID return LECTUREID; default: return null; @@ -15307,7 +15307,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // LECTUREID + case 1: // LECTUREID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lectureid = iprot.readString(); struct.setLectureidIsSet(true); @@ -15784,20 +15784,20 @@ public class Server { public static class updateImageData_args implements org.apache.thrift.TBase<updateImageData_args, updateImageData_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateImageData_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateImageData_args"); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-5); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-6); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-7); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-8); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-9); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-10); - private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-11); - private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-12); - private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-13); - private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)-14); + private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)5); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)6); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)7); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)8); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)11); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)12); + private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)13); + private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)14); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -15822,20 +15822,20 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NAME((short)-1, "name"), - NEW_NAME((short)-2, "newName"), - DESC((short)-3, "desc"), - IMAGE_PATH((short)-4, "image_path"), - LICENSE((short)-5, "license"), - INTERNET((short)-6, "internet"), - RAM((short)-7, "ram"), - CPU((short)-8, "cpu"), - ID((short)-9, "id"), - VERSION((short)-10, "version"), - IS_TEMPLATE((short)-11, "isTemplate"), - FILESIZE((short)-12, "filesize"), - SHARE_MODE((short)-13, "shareMode"), - OS((short)-14, "os"); + NAME((short)1, "name"), + NEW_NAME((short)2, "newName"), + DESC((short)3, "desc"), + IMAGE_PATH((short)4, "image_path"), + LICENSE((short)5, "license"), + INTERNET((short)6, "internet"), + RAM((short)7, "ram"), + CPU((short)8, "cpu"), + ID((short)9, "id"), + VERSION((short)10, "version"), + IS_TEMPLATE((short)11, "isTemplate"), + FILESIZE((short)12, "filesize"), + SHARE_MODE((short)13, "shareMode"), + OS((short)14, "os"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -15850,33 +15850,33 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // NAME + case 1: // NAME return NAME; - case -2: // NEW_NAME + case 2: // NEW_NAME return NEW_NAME; - case -3: // DESC + case 3: // DESC return DESC; - case -4: // IMAGE_PATH + case 4: // IMAGE_PATH return IMAGE_PATH; - case -5: // LICENSE + case 5: // LICENSE return LICENSE; - case -6: // INTERNET + case 6: // INTERNET return INTERNET; - case -7: // RAM + case 7: // RAM return RAM; - case -8: // CPU + case 8: // CPU return CPU; - case -9: // ID + case 9: // ID return ID; - case -10: // VERSION + case 10: // VERSION return VERSION; - case -11: // IS_TEMPLATE + case 11: // IS_TEMPLATE return IS_TEMPLATE; - case -12: // FILESIZE + case 12: // FILESIZE return FILESIZE; - case -13: // SHARE_MODE + case 13: // SHARE_MODE return SHARE_MODE; - case -14: // OS + case 14: // OS return OS; default: return null; @@ -17044,7 +17044,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // NAME + case 1: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -17052,7 +17052,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // NEW_NAME + case 2: // NEW_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.newName = iprot.readString(); struct.setNewNameIsSet(true); @@ -17060,7 +17060,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // DESC + case 3: // DESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.desc = iprot.readString(); struct.setDescIsSet(true); @@ -17068,7 +17068,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // IMAGE_PATH + case 4: // IMAGE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.image_path = iprot.readString(); struct.setImage_pathIsSet(true); @@ -17076,7 +17076,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // LICENSE + case 5: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -17084,7 +17084,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // INTERNET + case 6: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -17092,7 +17092,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // RAM + case 7: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -17100,7 +17100,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // CPU + case 8: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -17108,7 +17108,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // ID + case 9: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -17116,7 +17116,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // VERSION + case 10: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -17124,7 +17124,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // IS_TEMPLATE + case 11: // IS_TEMPLATE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); @@ -17132,7 +17132,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // FILESIZE + case 12: // FILESIZE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); @@ -17140,7 +17140,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // SHARE_MODE + case 13: // SHARE_MODE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); @@ -17148,7 +17148,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -14: // OS + case 14: // OS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.os = iprot.readString(); struct.setOsIsSet(true); @@ -17171,60 +17171,60 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.os != null) { - oprot.writeFieldBegin(OS_FIELD_DESC); - oprot.writeString(struct.os); + if (struct.name != null) { + oprot.writeFieldBegin(NAME_FIELD_DESC); + oprot.writeString(struct.name); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(SHARE_MODE_FIELD_DESC); - oprot.writeI64(struct.shareMode); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(FILESIZE_FIELD_DESC); - oprot.writeI64(struct.filesize); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); - oprot.writeBool(struct.isTemplate); - oprot.writeFieldEnd(); - if (struct.version != null) { - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeString(struct.version); + if (struct.newName != null) { + oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); + oprot.writeString(struct.newName); oprot.writeFieldEnd(); } - if (struct.id != null) { - oprot.writeFieldBegin(ID_FIELD_DESC); - oprot.writeString(struct.id); + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(CPU_FIELD_DESC); - oprot.writeI64(struct.cpu); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(RAM_FIELD_DESC); - oprot.writeI64(struct.ram); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(INTERNET_FIELD_DESC); - oprot.writeBool(struct.internet); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(LICENSE_FIELD_DESC); - oprot.writeBool(struct.license); - oprot.writeFieldEnd(); if (struct.image_path != null) { oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); oprot.writeString(struct.image_path); oprot.writeFieldEnd(); } - if (struct.desc != null) { - oprot.writeFieldBegin(DESC_FIELD_DESC); - oprot.writeString(struct.desc); + oprot.writeFieldBegin(LICENSE_FIELD_DESC); + oprot.writeBool(struct.license); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(INTERNET_FIELD_DESC); + oprot.writeBool(struct.internet); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(RAM_FIELD_DESC); + oprot.writeI64(struct.ram); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(CPU_FIELD_DESC); + oprot.writeI64(struct.cpu); + oprot.writeFieldEnd(); + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); oprot.writeFieldEnd(); } - if (struct.newName != null) { - oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); - oprot.writeString(struct.newName); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); oprot.writeFieldEnd(); } - if (struct.name != null) { - oprot.writeFieldBegin(NAME_FIELD_DESC); - oprot.writeString(struct.name); + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeBool(struct.isTemplate); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(FILESIZE_FIELD_DESC); + oprot.writeI64(struct.filesize); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(SHARE_MODE_FIELD_DESC); + oprot.writeI64(struct.shareMode); + oprot.writeFieldEnd(); + if (struct.os != null) { + oprot.writeFieldBegin(OS_FIELD_DESC); + oprot.writeString(struct.os); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -17754,8 +17754,8 @@ public class Server { public static class deleteImageData_args implements org.apache.thrift.TBase<deleteImageData_args, deleteImageData_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageData_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageData_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -17768,8 +17768,8 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"), - VERSION((short)-2, "version"); + ID((short)1, "id"), + VERSION((short)2, "version"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -17784,9 +17784,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // ID + case 1: // ID return ID; - case -2: // VERSION + case 2: // VERSION return VERSION; default: return null; @@ -18114,7 +18114,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // ID + case 1: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -18122,7 +18122,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // VERSION + case 2: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -18145,16 +18145,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.version != null) { - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeString(struct.version); - oprot.writeFieldEnd(); - } if (struct.id != null) { oprot.writeFieldBegin(ID_FIELD_DESC); oprot.writeString(struct.id); oprot.writeFieldEnd(); } + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -18562,23 +18562,23 @@ public class Server { public static class updateLecturedata_args implements org.apache.thrift.TBase<updateLecturedata_args, updateLecturedata_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateLecturedata_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateLecturedata_args"); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField SHORTDESC_FIELD_DESC = new org.apache.thrift.protocol.TField("shortdesc", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField END_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("endDate", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.BOOL, (short)-7); - private static final org.apache.thrift.protocol.TField IMAGEID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageid", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField IMAGEVERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageversion", org.apache.thrift.protocol.TType.STRING, (short)-9); - private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)-10); - private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)-11); - private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)-12); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-13); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)-14); - private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)-15); - private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)-16); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-17); + private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField SHORTDESC_FIELD_DESC = new org.apache.thrift.protocol.TField("shortdesc", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField END_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("endDate", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.BOOL, (short)7); + private static final org.apache.thrift.protocol.TField IMAGEID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageid", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField IMAGEVERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageversion", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)12); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)13); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)14); + private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)15); + private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)16); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)17); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -18606,23 +18606,23 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NAME((short)-1, "name"), - NEW_NAME((short)-2, "newName"), - SHORTDESC((short)-3, "shortdesc"), - DESC((short)-4, "desc"), - START_DATE((short)-5, "startDate"), - END_DATE((short)-6, "endDate"), - IS_ACTIVE((short)-7, "isActive"), - IMAGEID((short)-8, "imageid"), - IMAGEVERSION((short)-9, "imageversion"), - USER((short)-10, "user"), - FIRSTNAME((short)-11, "firstname"), - LASTNAME((short)-12, "lastname"), - UNIVERSITY((short)-13, "university"), - MAIL((short)-14, "Mail"), - TEL((short)-15, "Tel"), - FAK((short)-16, "Fak"), - ID((short)-17, "id"); + NAME((short)1, "name"), + NEW_NAME((short)2, "newName"), + SHORTDESC((short)3, "shortdesc"), + DESC((short)4, "desc"), + START_DATE((short)5, "startDate"), + END_DATE((short)6, "endDate"), + IS_ACTIVE((short)7, "isActive"), + IMAGEID((short)8, "imageid"), + IMAGEVERSION((short)9, "imageversion"), + USER((short)10, "user"), + FIRSTNAME((short)11, "firstname"), + LASTNAME((short)12, "lastname"), + UNIVERSITY((short)13, "university"), + MAIL((short)14, "Mail"), + TEL((short)15, "Tel"), + FAK((short)16, "Fak"), + ID((short)17, "id"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -18637,39 +18637,39 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // NAME + case 1: // NAME return NAME; - case -2: // NEW_NAME + case 2: // NEW_NAME return NEW_NAME; - case -3: // SHORTDESC + case 3: // SHORTDESC return SHORTDESC; - case -4: // DESC + case 4: // DESC return DESC; - case -5: // START_DATE + case 5: // START_DATE return START_DATE; - case -6: // END_DATE + case 6: // END_DATE return END_DATE; - case -7: // IS_ACTIVE + case 7: // IS_ACTIVE return IS_ACTIVE; - case -8: // IMAGEID + case 8: // IMAGEID return IMAGEID; - case -9: // IMAGEVERSION + case 9: // IMAGEVERSION return IMAGEVERSION; - case -10: // USER + case 10: // USER return USER; - case -11: // FIRSTNAME + case 11: // FIRSTNAME return FIRSTNAME; - case -12: // LASTNAME + case 12: // LASTNAME return LASTNAME; - case -13: // UNIVERSITY + case 13: // UNIVERSITY return UNIVERSITY; - case -14: // MAIL + case 14: // MAIL return MAIL; - case -15: // TEL + case 15: // TEL return TEL; - case -16: // FAK + case 16: // FAK return FAK; - case -17: // ID + case 17: // ID return ID; default: return null; @@ -20077,7 +20077,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // NAME + case 1: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -20085,7 +20085,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // NEW_NAME + case 2: // NEW_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.newName = iprot.readString(); struct.setNewNameIsSet(true); @@ -20093,7 +20093,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // SHORTDESC + case 3: // SHORTDESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.shortdesc = iprot.readString(); struct.setShortdescIsSet(true); @@ -20101,7 +20101,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // DESC + case 4: // DESC if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.desc = iprot.readString(); struct.setDescIsSet(true); @@ -20109,7 +20109,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // START_DATE + case 5: // START_DATE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.startDate = iprot.readString(); struct.setStartDateIsSet(true); @@ -20117,7 +20117,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // END_DATE + case 6: // END_DATE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.endDate = iprot.readString(); struct.setEndDateIsSet(true); @@ -20125,7 +20125,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // IS_ACTIVE + case 7: // IS_ACTIVE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isActive = iprot.readBool(); struct.setIsActiveIsSet(true); @@ -20133,7 +20133,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // IMAGEID + case 8: // IMAGEID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imageid = iprot.readString(); struct.setImageidIsSet(true); @@ -20141,7 +20141,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // IMAGEVERSION + case 9: // IMAGEVERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imageversion = iprot.readString(); struct.setImageversionIsSet(true); @@ -20149,7 +20149,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // USER + case 10: // USER if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.user = iprot.readString(); struct.setUserIsSet(true); @@ -20157,7 +20157,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // FIRSTNAME + case 11: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -20165,7 +20165,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // LASTNAME + case 12: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -20173,7 +20173,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // UNIVERSITY + case 13: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -20181,7 +20181,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -14: // MAIL + case 14: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -20189,7 +20189,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -15: // TEL + case 15: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -20197,7 +20197,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -16: // FAK + case 16: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -20205,7 +20205,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -17: // ID + case 17: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -20228,44 +20228,42 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.id != null) { - oprot.writeFieldBegin(ID_FIELD_DESC); - oprot.writeString(struct.id); - oprot.writeFieldEnd(); - } - if (struct.Fak != null) { - oprot.writeFieldBegin(FAK_FIELD_DESC); - oprot.writeString(struct.Fak); + if (struct.name != null) { + oprot.writeFieldBegin(NAME_FIELD_DESC); + oprot.writeString(struct.name); oprot.writeFieldEnd(); } - if (struct.Tel != null) { - oprot.writeFieldBegin(TEL_FIELD_DESC); - oprot.writeString(struct.Tel); + if (struct.newName != null) { + oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); + oprot.writeString(struct.newName); oprot.writeFieldEnd(); } - if (struct.Mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.Mail); + if (struct.shortdesc != null) { + oprot.writeFieldBegin(SHORTDESC_FIELD_DESC); + oprot.writeString(struct.shortdesc); oprot.writeFieldEnd(); } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); oprot.writeFieldEnd(); } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); + if (struct.startDate != null) { + oprot.writeFieldBegin(START_DATE_FIELD_DESC); + oprot.writeString(struct.startDate); oprot.writeFieldEnd(); } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); + if (struct.endDate != null) { + oprot.writeFieldBegin(END_DATE_FIELD_DESC); + oprot.writeString(struct.endDate); oprot.writeFieldEnd(); } - if (struct.user != null) { - oprot.writeFieldBegin(USER_FIELD_DESC); - oprot.writeString(struct.user); + oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); + oprot.writeBool(struct.isActive); + oprot.writeFieldEnd(); + if (struct.imageid != null) { + oprot.writeFieldBegin(IMAGEID_FIELD_DESC); + oprot.writeString(struct.imageid); oprot.writeFieldEnd(); } if (struct.imageversion != null) { @@ -20273,42 +20271,44 @@ public class Server { oprot.writeString(struct.imageversion); oprot.writeFieldEnd(); } - if (struct.imageid != null) { - oprot.writeFieldBegin(IMAGEID_FIELD_DESC); - oprot.writeString(struct.imageid); + if (struct.user != null) { + oprot.writeFieldBegin(USER_FIELD_DESC); + oprot.writeString(struct.user); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); - oprot.writeBool(struct.isActive); - oprot.writeFieldEnd(); - if (struct.endDate != null) { - oprot.writeFieldBegin(END_DATE_FIELD_DESC); - oprot.writeString(struct.endDate); + if (struct.firstname != null) { + oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); + oprot.writeString(struct.firstname); oprot.writeFieldEnd(); } - if (struct.startDate != null) { - oprot.writeFieldBegin(START_DATE_FIELD_DESC); - oprot.writeString(struct.startDate); + if (struct.lastname != null) { + oprot.writeFieldBegin(LASTNAME_FIELD_DESC); + oprot.writeString(struct.lastname); oprot.writeFieldEnd(); } - if (struct.desc != null) { - oprot.writeFieldBegin(DESC_FIELD_DESC); - oprot.writeString(struct.desc); + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.shortdesc != null) { - oprot.writeFieldBegin(SHORTDESC_FIELD_DESC); - oprot.writeString(struct.shortdesc); + if (struct.Mail != null) { + oprot.writeFieldBegin(MAIL_FIELD_DESC); + oprot.writeString(struct.Mail); oprot.writeFieldEnd(); } - if (struct.newName != null) { - oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); - oprot.writeString(struct.newName); + if (struct.Tel != null) { + oprot.writeFieldBegin(TEL_FIELD_DESC); + oprot.writeString(struct.Tel); oprot.writeFieldEnd(); } - if (struct.name != null) { - oprot.writeFieldBegin(NAME_FIELD_DESC); - oprot.writeString(struct.name); + if (struct.Fak != null) { + oprot.writeFieldBegin(FAK_FIELD_DESC); + oprot.writeString(struct.Fak); + oprot.writeFieldEnd(); + } + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -20868,8 +20868,8 @@ public class Server { public static class deleteImageServer_args implements org.apache.thrift.TBase<deleteImageServer_args, deleteImageServer_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageServer_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageServer_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -20882,8 +20882,8 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"), - VERSION((short)-2, "version"); + ID((short)1, "id"), + VERSION((short)2, "version"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -20898,9 +20898,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // ID + case 1: // ID return ID; - case -2: // VERSION + case 2: // VERSION return VERSION; default: return null; @@ -21228,7 +21228,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // ID + case 1: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -21236,7 +21236,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // VERSION + case 2: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -21259,16 +21259,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.version != null) { - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeString(struct.version); - oprot.writeFieldEnd(); - } if (struct.id != null) { oprot.writeFieldBegin(ID_FIELD_DESC); oprot.writeString(struct.id); oprot.writeFieldEnd(); } + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -21676,8 +21676,8 @@ public class Server { public static class connectedToLecture_args implements org.apache.thrift.TBase<connectedToLecture_args, connectedToLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<connectedToLecture_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("connectedToLecture_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -21690,8 +21690,8 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"), - VERSION((short)-2, "version"); + ID((short)1, "id"), + VERSION((short)2, "version"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -21706,9 +21706,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // ID + case 1: // ID return ID; - case -2: // VERSION + case 2: // VERSION return VERSION; default: return null; @@ -22036,7 +22036,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // ID + case 1: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -22044,7 +22044,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // VERSION + case 2: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -22067,16 +22067,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.version != null) { - oprot.writeFieldBegin(VERSION_FIELD_DESC); - oprot.writeString(struct.version); - oprot.writeFieldEnd(); - } if (struct.id != null) { oprot.writeFieldBegin(ID_FIELD_DESC); oprot.writeString(struct.id); oprot.writeFieldEnd(); } + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -22484,9 +22484,9 @@ public class Server { public static class deleteLecture_args implements org.apache.thrift.TBase<deleteLecture_args, deleteLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteLecture_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteLecture_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField HS_FIELD_DESC = new org.apache.thrift.protocol.TField("hs", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField HS_FIELD_DESC = new org.apache.thrift.protocol.TField("hs", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -22500,9 +22500,9 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"), - HS((short)-2, "hs"), - USER((short)-3, "user"); + ID((short)1, "id"), + HS((short)2, "hs"), + USER((short)3, "user"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -22517,11 +22517,11 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // ID + case 1: // ID return ID; - case -2: // HS + case 2: // HS return HS; - case -3: // USER + case 3: // USER return USER; default: return null; @@ -22921,7 +22921,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // ID + case 1: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -22929,7 +22929,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // HS + case 2: // HS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.hs = iprot.readString(); struct.setHsIsSet(true); @@ -22937,7 +22937,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // USER + case 3: // USER if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.user = iprot.readString(); struct.setUserIsSet(true); @@ -22960,9 +22960,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.user != null) { - oprot.writeFieldBegin(USER_FIELD_DESC); - oprot.writeString(struct.user); + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); oprot.writeFieldEnd(); } if (struct.hs != null) { @@ -22970,9 +22970,9 @@ public class Server { oprot.writeString(struct.hs); oprot.writeFieldEnd(); } - if (struct.id != null) { - oprot.writeFieldBegin(ID_FIELD_DESC); - oprot.writeString(struct.id); + if (struct.user != null) { + oprot.writeFieldBegin(USER_FIELD_DESC); + oprot.writeString(struct.user); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -23392,7 +23392,7 @@ public class Server { public static class checkUser_args implements org.apache.thrift.TBase<checkUser_args, checkUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<checkUser_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("checkUser_args"); - private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -23404,7 +23404,7 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USERNAME((short)-1, "username"); + USERNAME((short)1, "username"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -23419,7 +23419,7 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // USERNAME + case 1: // USERNAME return USERNAME; default: return null; @@ -23675,7 +23675,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // USERNAME + case 1: // USERNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.username = iprot.readString(); struct.setUsernameIsSet(true); @@ -24100,11 +24100,11 @@ public class Server { public static class createUser_args implements org.apache.thrift.TBase<createUser_args, createUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<createUser_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createUser_args"); - private static final org.apache.thrift.protocol.TField LOGIN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginName", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-5); + private static final org.apache.thrift.protocol.TField LOGIN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -24120,11 +24120,11 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - LOGIN_NAME((short)-1, "loginName"), - LAST_NAME((short)-2, "lastName"), - FIRST_NAME((short)-3, "firstName"), - MAIL((short)-4, "mail"), - UNIVERSITY((short)-5, "university"); + LOGIN_NAME((short)1, "loginName"), + LAST_NAME((short)2, "lastName"), + FIRST_NAME((short)3, "firstName"), + MAIL((short)4, "mail"), + UNIVERSITY((short)5, "university"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -24139,15 +24139,15 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // LOGIN_NAME + case 1: // LOGIN_NAME return LOGIN_NAME; - case -2: // LAST_NAME + case 2: // LAST_NAME return LAST_NAME; - case -3: // FIRST_NAME + case 3: // FIRST_NAME return FIRST_NAME; - case -4: // MAIL + case 4: // MAIL return MAIL; - case -5: // UNIVERSITY + case 5: // UNIVERSITY return UNIVERSITY; default: return null; @@ -24691,7 +24691,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // LOGIN_NAME + case 1: // LOGIN_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.loginName = iprot.readString(); struct.setLoginNameIsSet(true); @@ -24699,7 +24699,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // LAST_NAME + case 2: // LAST_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastName = iprot.readString(); struct.setLastNameIsSet(true); @@ -24707,7 +24707,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // FIRST_NAME + case 3: // FIRST_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstName = iprot.readString(); struct.setFirstNameIsSet(true); @@ -24715,7 +24715,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // MAIL + case 4: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.mail = iprot.readString(); struct.setMailIsSet(true); @@ -24723,7 +24723,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // UNIVERSITY + case 5: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -24746,14 +24746,14 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); + if (struct.loginName != null) { + oprot.writeFieldBegin(LOGIN_NAME_FIELD_DESC); + oprot.writeString(struct.loginName); oprot.writeFieldEnd(); } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.lastName != null) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); oprot.writeFieldEnd(); } if (struct.firstName != null) { @@ -24761,14 +24761,14 @@ public class Server { oprot.writeString(struct.firstName); oprot.writeFieldEnd(); } - if (struct.lastName != null) { - oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); - oprot.writeString(struct.lastName); + if (struct.mail != null) { + oprot.writeFieldBegin(MAIL_FIELD_DESC); + oprot.writeString(struct.mail); oprot.writeFieldEnd(); } - if (struct.loginName != null) { - oprot.writeFieldBegin(LOGIN_NAME_FIELD_DESC); - oprot.writeString(struct.loginName); + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -25208,13 +25208,13 @@ public class Server { public static class writeImageRights_args implements org.apache.thrift.TBase<writeImageRights_args, writeImageRights_args._Fields>, java.io.Serializable, Cloneable, Comparable<writeImageRights_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("writeImageRights_args"); - private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.STRING, (short)-7); + private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -25232,13 +25232,13 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IMAGENAME((short)-1, "imagename"), - USERNAME((short)-2, "username"), - LAST_NAME((short)-3, "lastName"), - FIRST_NAME((short)-4, "firstName"), - MAIL((short)-5, "mail"), - UNIVERSITY((short)-6, "university"), - ROLE((short)-7, "role"); + IMAGENAME((short)1, "imagename"), + USERNAME((short)2, "username"), + LAST_NAME((short)3, "lastName"), + FIRST_NAME((short)4, "firstName"), + MAIL((short)5, "mail"), + UNIVERSITY((short)6, "university"), + ROLE((short)7, "role"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -25253,19 +25253,19 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // IMAGENAME + case 1: // IMAGENAME return IMAGENAME; - case -2: // USERNAME + case 2: // USERNAME return USERNAME; - case -3: // LAST_NAME + case 3: // LAST_NAME return LAST_NAME; - case -4: // FIRST_NAME + case 4: // FIRST_NAME return FIRST_NAME; - case -5: // MAIL + case 5: // MAIL return MAIL; - case -6: // UNIVERSITY + case 6: // UNIVERSITY return UNIVERSITY; - case -7: // ROLE + case 7: // ROLE return ROLE; default: return null; @@ -25953,7 +25953,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // IMAGENAME + case 1: // IMAGENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -25961,7 +25961,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // USERNAME + case 2: // USERNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.username = iprot.readString(); struct.setUsernameIsSet(true); @@ -25969,7 +25969,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LAST_NAME + case 3: // LAST_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastName = iprot.readString(); struct.setLastNameIsSet(true); @@ -25977,7 +25977,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // FIRST_NAME + case 4: // FIRST_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstName = iprot.readString(); struct.setFirstNameIsSet(true); @@ -25985,7 +25985,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // MAIL + case 5: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.mail = iprot.readString(); struct.setMailIsSet(true); @@ -25993,7 +25993,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // UNIVERSITY + case 6: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -26001,7 +26001,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // ROLE + case 7: // ROLE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.role = iprot.readString(); struct.setRoleIsSet(true); @@ -26024,19 +26024,19 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.role != null) { - oprot.writeFieldBegin(ROLE_FIELD_DESC); - oprot.writeString(struct.role); + if (struct.imagename != null) { + oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); + oprot.writeString(struct.imagename); oprot.writeFieldEnd(); } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); + if (struct.username != null) { + oprot.writeFieldBegin(USERNAME_FIELD_DESC); + oprot.writeString(struct.username); oprot.writeFieldEnd(); } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.lastName != null) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); oprot.writeFieldEnd(); } if (struct.firstName != null) { @@ -26044,19 +26044,19 @@ public class Server { oprot.writeString(struct.firstName); oprot.writeFieldEnd(); } - if (struct.lastName != null) { - oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); - oprot.writeString(struct.lastName); + if (struct.mail != null) { + oprot.writeFieldBegin(MAIL_FIELD_DESC); + oprot.writeString(struct.mail); oprot.writeFieldEnd(); } - if (struct.username != null) { - oprot.writeFieldBegin(USERNAME_FIELD_DESC); - oprot.writeString(struct.username); + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.imagename != null) { - oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); - oprot.writeString(struct.imagename); + if (struct.role != null) { + oprot.writeFieldBegin(ROLE_FIELD_DESC); + oprot.writeString(struct.role); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -26516,13 +26516,13 @@ public class Server { public static class writeLectureRights_args implements org.apache.thrift.TBase<writeLectureRights_args, writeLectureRights_args._Fields>, java.io.Serializable, Cloneable, Comparable<writeLectureRights_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("writeLectureRights_args"); - private static final org.apache.thrift.protocol.TField LECTURENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lecturename", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.STRING, (short)-7); + private static final org.apache.thrift.protocol.TField LECTURENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lecturename", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("mail", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -26540,13 +26540,13 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - LECTURENAME((short)-1, "lecturename"), - USERNAME((short)-2, "username"), - LAST_NAME((short)-3, "lastName"), - FIRST_NAME((short)-4, "firstName"), - MAIL((short)-5, "mail"), - UNIVERSITY((short)-6, "university"), - ROLE((short)-7, "role"); + LECTURENAME((short)1, "lecturename"), + USERNAME((short)2, "username"), + LAST_NAME((short)3, "lastName"), + FIRST_NAME((short)4, "firstName"), + MAIL((short)5, "mail"), + UNIVERSITY((short)6, "university"), + ROLE((short)7, "role"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -26561,19 +26561,19 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // LECTURENAME + case 1: // LECTURENAME return LECTURENAME; - case -2: // USERNAME + case 2: // USERNAME return USERNAME; - case -3: // LAST_NAME + case 3: // LAST_NAME return LAST_NAME; - case -4: // FIRST_NAME + case 4: // FIRST_NAME return FIRST_NAME; - case -5: // MAIL + case 5: // MAIL return MAIL; - case -6: // UNIVERSITY + case 6: // UNIVERSITY return UNIVERSITY; - case -7: // ROLE + case 7: // ROLE return ROLE; default: return null; @@ -27261,7 +27261,7 @@ public class Server { break; } switch (schemeField.id) { - case -1: // LECTURENAME + case 1: // LECTURENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lecturename = iprot.readString(); struct.setLecturenameIsSet(true); @@ -27269,7 +27269,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // USERNAME + case 2: // USERNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.username = iprot.readString(); struct.setUsernameIsSet(true); @@ -27277,7 +27277,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LAST_NAME + case 3: // LAST_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastName = iprot.readString(); struct.setLastNameIsSet(true); @@ -27285,7 +27285,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // FIRST_NAME + case 4: // FIRST_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstName = iprot.readString(); struct.setFirstNameIsSet(true); @@ -27293,7 +27293,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // MAIL + case 5: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.mail = iprot.readString(); struct.setMailIsSet(true); @@ -27301,7 +27301,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // UNIVERSITY + case 6: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -27309,7 +27309,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // ROLE + case 7: // ROLE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.role = iprot.readString(); struct.setRoleIsSet(true); @@ -27332,19 +27332,19 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.role != null) { - oprot.writeFieldBegin(ROLE_FIELD_DESC); - oprot.writeString(struct.role); + if (struct.lecturename != null) { + oprot.writeFieldBegin(LECTURENAME_FIELD_DESC); + oprot.writeString(struct.lecturename); oprot.writeFieldEnd(); } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); + if (struct.username != null) { + oprot.writeFieldBegin(USERNAME_FIELD_DESC); + oprot.writeString(struct.username); oprot.writeFieldEnd(); } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.lastName != null) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); oprot.writeFieldEnd(); } if (struct.firstName != null) { @@ -27352,19 +27352,19 @@ public class Server { oprot.writeString(struct.firstName); oprot.writeFieldEnd(); } - if (struct.lastName != null) { - oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); - oprot.writeString(struct.lastName); + if (struct.mail != null) { + oprot.writeFieldBegin(MAIL_FIELD_DESC); + oprot.writeString(struct.mail); oprot.writeFieldEnd(); } - if (struct.username != null) { - oprot.writeFieldBegin(USERNAME_FIELD_DESC); - oprot.writeString(struct.username); + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.lecturename != null) { - oprot.writeFieldBegin(LECTURENAME_FIELD_DESC); - oprot.writeString(struct.lecturename); + if (struct.role != null) { + oprot.writeFieldBegin(ROLE_FIELD_DESC); + oprot.writeString(struct.role); oprot.writeFieldEnd(); } oprot.writeFieldStop(); diff --git a/dozentenmodulserver/src/main/java/server/User.java b/dozentenmodulserver/src/main/java/server/generated/User.java index 7bf98cc4..181c332d 100644 --- a/dozentenmodulserver/src/main/java/server/User.java +++ b/dozentenmodulserver/src/main/java/server/generated/User.java @@ -4,7 +4,7 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ -package server; +package server.generated; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; @@ -35,9 +35,9 @@ import org.slf4j.LoggerFactory; public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User"); - private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -51,9 +51,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_NAME((short)-1, "userName"), - PASSWORD((short)-2, "password"), - PATH((short)-3, "path"); + USER_NAME((short)1, "userName"), + PASSWORD((short)2, "password"), + PATH((short)3, "path"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -68,11 +68,11 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // USER_NAME + case 1: // USER_NAME return USER_NAME; - case -2: // PASSWORD + case 2: // PASSWORD return PASSWORD; - case -3: // PATH + case 3: // PATH return PATH; default: return null; @@ -472,7 +472,7 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i break; } switch (schemeField.id) { - case -1: // USER_NAME + case 1: // USER_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userName = iprot.readString(); struct.setUserNameIsSet(true); @@ -480,7 +480,7 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // PASSWORD + case 2: // PASSWORD if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.password = iprot.readString(); struct.setPasswordIsSet(true); @@ -488,7 +488,7 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // PATH + case 3: // PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.path = iprot.readString(); struct.setPathIsSet(true); @@ -511,9 +511,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.path != null) { - oprot.writeFieldBegin(PATH_FIELD_DESC); - oprot.writeString(struct.path); + if (struct.userName != null) { + oprot.writeFieldBegin(USER_NAME_FIELD_DESC); + oprot.writeString(struct.userName); oprot.writeFieldEnd(); } if (struct.password != null) { @@ -521,9 +521,9 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i oprot.writeString(struct.password); oprot.writeFieldEnd(); } - if (struct.userName != null) { - oprot.writeFieldBegin(USER_NAME_FIELD_DESC); - oprot.writeString(struct.userName); + if (struct.path != null) { + oprot.writeFieldBegin(PATH_FIELD_DESC); + oprot.writeString(struct.path); oprot.writeFieldEnd(); } oprot.writeFieldStop(); diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index ac6fedbb..35338445 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -18,8 +18,8 @@ import models.Configuration; import org.apache.log4j.Logger;
import server.BinaryListener;
-import server.Image;
-import server.Lecture;
+import server.generated.Image;
+import server.generated.Lecture;
public class SQL {
diff --git a/dozentenmodulserver/thrift/server.thrift b/dozentenmodulserver/thrift/server.thrift index 51bc1765..d8cf2506 100644 --- a/dozentenmodulserver/thrift/server.thrift +++ b/dozentenmodulserver/thrift/server.thrift @@ -1,61 +1,60 @@ /** * Define some namespace/package name for our stuff */ -namespace java server +namespace java server.generated typedef i64 int struct User{ - string userName, - string password, - string path, + 1: string userName, + 2: string password, + 3: string path, } struct Image{ - string id, - string version, - string imageName, - string licenseRestriction, - string osName, - string lectureName, - string updateTime, - string userData, - string isTemplate, + 1: string id, + 2: string version, + 3: string imageName, + 4: string licenseRestriction, + 5: string osName, + 6: string lectureName, + 7: string updateTime, + 8: string userData, + 9: string isTemplate, } struct Lecture{ - string id, - string lecturename, - string isActive, - string starttime, - string endtime, - string lastused, - string desc, - string imagename, - string username, - + 1: string id, + 2: string lecturename, + 3: string isActive, + 4: string starttime, + 5: string endtime, + 6: string lastused, + 7: string desc, + 8: string imagename, + 9: string username, } service Server{ User getFtpUser(), - int DeleteFtpUser(string user), - string getPathOfImage(string image_id,string version), - bool writeVLdata(string imagename, string desc ,string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize, int shareMode, string os), + int DeleteFtpUser(1: string user), + string getPathOfImage(1: string image_id, 2: string version), + bool writeVLdata(1: string imagename, 2: string desc, 3: string login, 4: string firstname, 5: string lastname, 6: string university, 7: string Mail, 8: string Tel, 9: string Fak, 10: bool license, 11: bool internet, 12: int ram, 13: int cpu, 14: string imagePath, 15: bool isTemplate, 16: i64 filesize, 17: int shareMode, 18: string os), list<Image> getImageList(), list<Lecture> getLectureList(), list<string> getAllOS(), list<string> getAllUniversities(), - map<string,string> getPersonData(string Vorname, string Nachname), - bool writeLecturedata(string name, string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string login,string firstname,string lastname, string university, string Mail, string Tel,string Fak), - bool startFileCopy(string file), - map<string,string> getImageData(string imageid, string imageversion), - map<string,string> getLectureData(string lectureid), - bool updateImageData(string name, string newName,string desc,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize, int shareMode, string os), - bool deleteImageData(string id, string version), - bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imageid, string imageversion,string user,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), - bool deleteImageServer(string id, string version), - bool connectedToLecture(string id, string version), - bool deleteLecture(string id, string hs, string user), - bool checkUser(string username), - bool createUser(string loginName, string lastName, string firstName, string mail, string university), - bool writeImageRights(string imagename, string username, string lastName, string firstName, string mail, string university, string role), - bool writeLectureRights(string lecturename, string username, string lastName, string firstName, string mail, string university, string role), -}
\ No newline at end of file + map<string,string> getPersonData(1: string Vorname, 2: string Nachname), + bool writeLecturedata(1: string name, 2: string shortdesc, 3: string desc, 4: string startDate, 5: string endDate, 6: bool isActive, 7: string imagename, 8: string login, 9: string firstname, 10: string lastname, 11: string university, 12: string Mail, 13: string Tel, 14: string Fak), + bool startFileCopy(1: string file), + map<string,string> getImageData(1: string imageid, 2: string imageversion), + map<string,string> getLectureData(1: string lectureid), + bool updateImageData(1: string name, 2: string newName, 3: string desc, 4: string image_path, 5: bool license, 6: bool internet, 7: int ram, 8: int cpu, 9: string id, 10: string version, 11: bool isTemplate, 12: i64 filesize, 13: int shareMode, 14: string os), + bool deleteImageData(1: string id, 2: string version), + bool updateLecturedata(1: string name, 2: string newName, 3: string shortdesc, 4: string desc, 5: string startDate, 6: string endDate, 7: bool isActive, 8: string imageid, 9: string imageversion, 10: string user, 11: string firstname, 12: string lastname, 13: string university, 14: string Mail, 15: string Tel, 16: string Fak, 17: string id), + bool deleteImageServer(1: string id, 2: string version), + bool connectedToLecture(1: string id, 2: string version), + bool deleteLecture(1: string id, 2: string hs, 3: string user), + bool checkUser(1: string username), + bool createUser(1: string loginName, 2: string lastName, 3: string firstName, 4: string mail, 5: string university), + bool writeImageRights(1: string imagename, 2: string username, 3: string lastName, 4: string firstName, 5: string mail, 6: string university, 7: string role), + bool writeLectureRights(1: string lecturename, 2: string username, 3: string lastName, 4: string firstName, 5: string mail, 6: string university, 7: string role), +} |