diff options
32 files changed, 8476 insertions, 4756 deletions
diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java index eee607be..ae607c8a 100644 --- a/dozentenmodul/src/main/java/ftp/DownloadTask.java +++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java @@ -11,6 +11,7 @@ import javax.swing.JOptionPane; import javax.swing.SwingWorker; import models.Image; +import models.SessionData; import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; @@ -152,7 +153,7 @@ public class DownloadTask extends SwingWorker<Void, Void> { LOGGER.debug("Image's ID: " + Image.image.getImageId()); Map<String, String> imageData = null; try { - imageData = models.Client.clientcon.getClient().getImageData(Image.image.getImageId(), Image.image.getVersion()); + imageData = models.Client.clientcon.getClient().getImageData(Image.image.getImageId(), Image.image.getVersion(), SessionData.session.getAuthToken()); } catch (TException e) { LOGGER.error("Thrift exception during transfer, see trace: ", e); return false; diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index 5d72fc36..b10000ef 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -36,13 +36,16 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Links; +import models.SessionData; import models.person; +import server.generated.Server.Client; import util.GuiOrganizer; import util.OpenLinks; import javax.swing.JScrollPane; import org.apache.log4j.Logger; +import org.apache.thrift.TException; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { @@ -70,6 +73,7 @@ public class CreateImageAllgemein_GUI extends JFrame { "Um das Image richtig zuordnen zu können, werden hier einige grundlegende Informationen benötigt.<br />" + "Geben Sie daher bitte einen allgemeinen Namen, sowie eine genauere Beschreibung ihres Images (Labors) an.<br />" + "</div></html>"; + Client client = models.Client.clientcon.getClient(); /** * Create the dialog. @@ -78,6 +82,12 @@ public class CreateImageAllgemein_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } // Beendet das Fenster auf X System.exit(0); } diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index b77f93ea..12ef7554 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -43,6 +43,7 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Links; +import models.SessionData; import server.generated.Server.Client; import thrift.ThriftConnection; import util.GuiOrganizer; @@ -60,7 +61,7 @@ public class CreateImageTechnisch_GUI extends JFrame { * Logger instance for this class. */ private final static Logger LOGGER = Logger.getLogger(CreateImageTechnisch_GUI.class); - + private final JPanel contentPanel = new JPanel(); String[] result; JSpinner spinnerCPU; @@ -89,6 +90,12 @@ public class CreateImageTechnisch_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } System.exit(0); } }); @@ -184,7 +191,7 @@ public class CreateImageTechnisch_GUI extends JFrame { comboBox = new JComboBox<String>(); List<String> os = null; try { - os = client.getAllOS(); + os = client.getAllOS(SessionData.session.getAuthToken()); for(int i=0; i<os.size();i++){ comboBox.addItem(os.get(i).toString()); } diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index fe956f8f..09a6a966 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -158,14 +158,7 @@ public class DeleteImage_GUI extends JFrame { * Create the dialog. */ public DeleteImage_GUI(Component formerGUI) { - - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - + filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -177,6 +170,12 @@ public class DeleteImage_GUI extends JFrame { public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } @@ -325,7 +324,7 @@ public class DeleteImage_GUI extends JFrame { try { // Holt sich eine Liste aller verfügbaren Betriebssysteme vom // Server - List<String> list = client.getAllOS(); + List<String> list = client.getAllOS(SessionData.session.getAuthToken()); // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { @@ -376,7 +375,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Hauuetmenue con.closeThriftConnection(); - + // oeffnet das Hauuetmenue DeleteImage_GUI.this.setVisible(false); @@ -412,8 +411,7 @@ public class DeleteImage_GUI extends JFrame { String imageid = ""; String imageversion = ""; int eingabe; - String username = person.verantwortlicher.getName() + " " - + person.verantwortlicher.getVorname(); + if (tablemyImages.getSelectedRowCount() != 0) { // frage, soll das selektierte Daten geloescht werden? @@ -441,11 +439,12 @@ public class DeleteImage_GUI extends JFrame { try { if (!client.connectedToLecture(imageid, - imageversion)) { + imageversion,SessionData.session.getAuthToken())) { try { - client.deleteImageServer(imageid, - imageversion); - if (client.deleteImageData(imageid,imageversion)) { + + client.deleteImageServer(imageid,imageversion, SessionData.session.getAuthToken()); + + if (client.deleteImageData(imageid,imageversion,SessionData.session.getAuthToken())) { LOGGER.info("Image '"+imageid+"' erfolgreich gelöscht."); @@ -787,7 +786,7 @@ public class DeleteImage_GUI extends JFrame { images = client.getImageList(person.verantwortlicher.getUserID()); } else { //get permitted list - images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID()); + images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } Iterator<server.generated.Image> i = images.iterator(); @@ -854,7 +853,7 @@ public class DeleteImage_GUI extends JFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getImageData(id, version); + Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index a848c805..273e3748 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -39,6 +39,7 @@ import javax.swing.border.TitledBorder; import models.Image; import models.ItemOwner; import models.Links; +import models.SessionData; import models.person; import org.apache.log4j.Logger; @@ -95,6 +96,12 @@ public class EditImageAllgemein_GUI extends JFrame { public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung bei einem Klick auf das X con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } }); @@ -439,8 +446,8 @@ public class EditImageAllgemein_GUI extends JFrame { public void initData() { try { - Map<String, String> map = client.getImageData( - Image.image.getImageId(), Image.image.getVersion()); + Map<String, String> map = client.getImageData(Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken()); + if (map.get("internet").equals("0")) { Image.image.setInternet(false); } else { diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index f9701a0c..418ce276 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -41,6 +41,7 @@ import thrift.ThriftConnection; import util.OpenLinks; import models.Image; import models.Links; +import models.SessionData; import models.person; import javax.swing.JComboBox; @@ -82,7 +83,12 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung bei Klick auf das X - + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } @@ -174,7 +180,7 @@ public class EditImageTechnisch_GUI extends JFrame { comboBox = new JComboBox<String>(); List<String> os = null; try { - os=client.getAllOS(); + os=client.getAllOS(SessionData.session.getAuthToken()); for(int i=0;i<os.size();i++) { comboBox.addItem(os.get(i).toString()); } @@ -192,7 +198,7 @@ public class EditImageTechnisch_GUI extends JFrame { panel_1.add(comboBox); try { - comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS())); + comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken())); } catch (TException e1) { // TODO Auto-generated catch block @@ -355,7 +361,7 @@ public class EditImageTechnisch_GUI extends JFrame { try { //check if user may change permissions and choose window - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(),Image.image.getImageId()) == true){ + if(client.userIsImageAdmin(Image.image.getImageId(),SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()) == true){ //user has permission, go to permission GUI PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c); ea.setVisible(true); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 80c88c98..324ae01a 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -121,8 +121,8 @@ public class FTPCreateUploader_GUI extends JFrame implements try { - client.setTokenForSession(SessionData.session.getAuthToken()); - uuid = client.createRandomUUID(); + + uuid = client.createRandomUUID(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -146,18 +146,31 @@ public class FTPCreateUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName, SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } task.cancel(true); con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); }// end if choice } else { // no upload running, close window - System.exit(0); + + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + System.exit(0); + } }// end if taskrun }// end window closing }); @@ -386,7 +399,7 @@ public class FTPCreateUploader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("Deleted FTP user."); } catch (TException e1) { // TODO Auto-generated catch block @@ -445,7 +458,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block @@ -478,7 +491,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -581,7 +594,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } }); menuBar.add(mnNewMenu_Info); - + //System.out.println("userID is: "+person.verantwortlicher.getUserID()); c = this; } @@ -594,7 +607,7 @@ public class FTPCreateUploader_GUI extends JFrame implements try { LOGGER.info("Getting FTP User..."); - user = client.getFtpUser(); + user = client.getFtpUser(SessionData.session.getAuthToken()); LOGGER.info("Received FTP user."); //LOGGER.debug("FTP name: " + user.userName); //LOGGER.debug("FTP path: " + user.path); @@ -689,13 +702,9 @@ public class FTPCreateUploader_GUI extends JFrame implements try { - client.writeVLdata(Image.image.getImagename(), + client.writeVLdata( + Image.image.getImagename(), Image.image.getDesc(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), Image.image.isLicensed(), @@ -707,19 +716,16 @@ public class FTPCreateUploader_GUI extends JFrame implements Image.image.getFilesize(), Image.image.getShareMode(), Image.image.getOS(), - uuid); - - client.startFileCopy(Image.image.getNewName()); - - client.writeImageRights(uuid, - person.verantwortlicher.getUsername(), - person.verantwortlicher.getName(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getRole() + uuid, + SessionData.session.getAuthToken(), + person.verantwortlicher.getUserID() ); + System.out.println("userID is: "+person.verantwortlicher.getUserID()); + client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); + + client.writeImageRights(uuid,SessionData.session.getAuthToken(),person.verantwortlicher.getRole(),person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID()); + for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++) { //System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); @@ -729,7 +735,8 @@ public class FTPCreateUploader_GUI extends JFrame implements RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin() + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(), + SessionData.session.getAuthToken() ); /* LOGGER.info( diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index a3e4c6cf..34e3efb3 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -49,8 +49,9 @@ import org.ini4j.Wini; import server.generated.Server.Client; import server.generated.User; import thrift.ThriftConnection; -import util.GuiOrganizer; import util.OpenLinks; + + import ftp.DownloadTask; import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; @@ -65,7 +66,7 @@ public class FTPEditDownloader_GUI extends JFrame implements */ private final static Logger LOGGER = Logger .getLogger(FTPEditDownloader_GUI.class); - + @SuppressWarnings("unused") private JPanel contentPane; private final JPanel contentPanel = new JPanel(); @@ -108,12 +109,6 @@ public class FTPEditDownloader_GUI extends JFrame implements */ public FTPEditDownloader_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } final Object[] options = { "Beenden", "Abbrechen" }; @@ -133,8 +128,14 @@ public class FTPEditDownloader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -144,6 +145,12 @@ public class FTPEditDownloader_GUI extends JFrame implements }// end if coice } else { // no download running, close window + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } System.exit(0); }// end if taskrun }// end window closing @@ -420,7 +427,7 @@ public class FTPEditDownloader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("FTP user deleted."); } catch (TException e1) { // TODO Auto-generated catch block @@ -459,7 +466,7 @@ public class FTPEditDownloader_GUI extends JFrame implements if (choice == 0) { task.cancel(true); try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -518,12 +525,12 @@ public class FTPEditDownloader_GUI extends JFrame implements // Klick btnDownloadStarten.setText("Bitte warten"); try { - user = client.getFtpUser(); + user = client.getFtpUser(SessionData.session.getAuthToken()); downloadFile = user.path + "/" + client.getPathOfImage(Image.image.getImageId(), - Image.image.getVersion()); + Image.image.getVersion(),SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 415e3dee..18925ff7 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -113,12 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements */ public FTPEditUploader_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } + final Object[] options = { "Beenden", "Abbrechen" }; @@ -139,16 +134,34 @@ public class FTPEditUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } task.cancel(true); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); }// end if choice } else { // no upload running, close window + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); }// end if taskrun }// end window closing @@ -351,7 +364,7 @@ public class FTPEditUploader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("FTP user deleted."); } catch (TException e1) { e1.printStackTrace(); @@ -417,7 +430,7 @@ public class FTPEditUploader_GUI extends JFrame implements if (taskrun == true) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); @@ -447,7 +460,7 @@ public class FTPEditUploader_GUI extends JFrame implements // 0=beenden, 1=abbrechen if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { e1.printStackTrace(); } @@ -455,7 +468,7 @@ public class FTPEditUploader_GUI extends JFrame implements // not loading files, go back one page try { - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true){ + if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true){ //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); ei.setVisible(true); @@ -483,7 +496,10 @@ public class FTPEditUploader_GUI extends JFrame implements JOptionPane.YES_NO_OPTION); if (selectedOption == JOptionPane.YES_OPTION) { try { - if(client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true){ + System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID()); + + if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true) + { //user is admin and may change permissions PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c); ei.setVisible(true); @@ -587,7 +603,7 @@ public class FTPEditUploader_GUI extends JFrame implements try { //LOGGER.info("Getting FTP-User..."); - user = client.getFtpUser(); + user = client.getFtpUser(SessionData.session.getAuthToken()); LOGGER.info("Received FTP user."); //LOGGER.debug("FTP name: " + user.userName); //LOGGER.debug("FTP path: " + user.path); @@ -704,9 +720,11 @@ public class FTPEditUploader_GUI extends JFrame implements Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), - Image.image.getOS()); + Image.image.getOS(), + SessionData.session.getAuthToken() + ); if (fileupload == true) { - client.startFileCopy(Image.image.getNewName()); + client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); } } else { //no new file uploaded and old file name stays @@ -727,10 +745,12 @@ public class FTPEditUploader_GUI extends JFrame implements Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), - Image.image.getOS()); + Image.image.getOS(), + SessionData.session.getAuthToken() + ); if (fileupload == true) { - client.startFileCopy(Image.image.getNewName()); + client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken()); // client.startFileCopy(Image.image.getImagename()); } } @@ -738,9 +758,7 @@ public class FTPEditUploader_GUI extends JFrame implements // remove all additional user permissions on first stage - client.deleteAllAdditionalImagePermissions( - Image.image.getImageId(), - person.verantwortlicher.getUserID()); + client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()); // then, add user permissions as they have been set new for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) @@ -758,7 +776,9 @@ public class FTPEditUploader_GUI extends JFrame implements RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()); + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(), + SessionData.session.getAuthToken() + ); }// end for diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java index 1810f0b1..fea3ae42 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java @@ -105,12 +105,6 @@ public class FTPSearchDownloader_GUI extends JFrame implements */ public FTPSearchDownloader_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } final Object[] options = { "Beenden", "Abbrechen" }; @@ -131,8 +125,20 @@ public class FTPSearchDownloader_GUI extends JFrame implements if (choice == 0) { try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } con.closeThriftConnection(); + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -143,6 +149,12 @@ public class FTPSearchDownloader_GUI extends JFrame implements }// end if choice } else { // no download running, close window + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } System.exit(0); }// end if taskrun }// end window closing @@ -429,7 +441,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements isAborted = true; // set flag try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); LOGGER.info("Deleted FTP user."); } catch (TException e1) { // TODO Auto-generated catch block @@ -469,7 +481,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements if (choice == 0) { task.cancel(true); try { - client.DeleteFtpUser(user.userName); + client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -531,12 +543,12 @@ public class FTPSearchDownloader_GUI extends JFrame implements // Klick btnDownloadStarten.setText("Bitte warten"); try { - user = client.getFtpUser(); + user = client.getFtpUser(SessionData.session.getAuthToken()); downloadFile = user.path + "/" + client.getPathOfImage(Image.image.getImageId(), - Image.image.getVersion()); + Image.image.getVersion(),SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index e1696ac4..b7f2e8ae 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -1,7 +1,6 @@ package gui.image; import gui.intro.About_GUI; -import gui.intro.ListAllOtherUsers_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -64,6 +63,7 @@ import org.apache.thrift.TException; import server.generated.Person; import server.generated.Server.Client; import util.CheckIntegrity; +import util.ListAllOtherUsers_GUI; import util.OpenLinks; @SuppressWarnings("serial") @@ -121,17 +121,17 @@ public class PermissionCreateImage_GUI extends JFrame { public PermissionCreateImage_GUI(Component formerGUI) { - - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } }); diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index f0eeeb11..17b083a3 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -1,7 +1,6 @@ package gui.image; import gui.intro.About_GUI; -import gui.intro.ListAllOtherUsers_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -59,6 +58,7 @@ import org.apache.thrift.TException; import server.generated.Person; import server.generated.Server.Client; import util.CheckIntegrity; +import util.ListAllOtherUsers_GUI; import util.OpenLinks; @SuppressWarnings("serial") @@ -108,18 +108,17 @@ public class PermissionEditImage_GUI extends JFrame { + "</div></html>"; public PermissionEditImage_GUI(Component formerGUI) { - - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } }); @@ -203,7 +202,7 @@ public class PermissionEditImage_GUI extends JFrame { //System.out.println("Loading data from db"); try { - map = client.getPermissionForUserAndImage(person.verantwortlicher.getUserID(), Image.image.getImageId()); + map = client.getPermissionForUserAndImage(SessionData.session.getAuthToken(),Image.image.getImageId(),person.verantwortlicher.getUserID()); Iterator<server.generated.Person> i = map.iterator(); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 7b8578c6..1b5feb6e 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -147,13 +147,6 @@ public class SearchEditImage_GUI extends JFrame { */ public SearchEditImage_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -163,7 +156,14 @@ public class SearchEditImage_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); + System.exit(0); } @@ -321,7 +321,7 @@ public class SearchEditImage_GUI extends JFrame { try { // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom // Server - List<String> list = client.getAllOS(); + List<String> list = client.getAllOS(SessionData.session.getAuthToken()); // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { @@ -763,7 +763,7 @@ public class SearchEditImage_GUI extends JFrame { images = client.getImageList(person.verantwortlicher.getUserID()); } else { //only get permitted list - images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID()); + images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } Iterator<server.generated.Image> i = images.iterator(); @@ -830,7 +830,7 @@ public class SearchEditImage_GUI extends JFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getImageData(id, version); + Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); @@ -859,7 +859,7 @@ public class SearchEditImage_GUI extends JFrame { textAreadesc.setText(res.get("desc")); res.clear(); - List<String> contacts = client.getAdditionalImageContacts(id); + List<String> contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken()); labelWeitereVerantwortliche.setText(""); for (int i = 0; i < contacts.size(); i++) { @@ -879,7 +879,7 @@ public class SearchEditImage_GUI extends JFrame { try { //get values from server and set them in model - map=client.getItemOwner(imageid); + map=client.getItemOwner(imageid,SessionData.session.getAuthToken()); ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index a0d36c5a..e9decd1b 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -167,20 +167,17 @@ public class SearchImage_GUI extends JFrame { */
public SearchImage_GUI(Component formerGUI) {
-
-
- try {
- client.setTokenForSession(SessionData.session.getAuthToken());
- } catch (TException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent arg0) {
// Beendet die Anwendung nach klick auf X
+ try {
+ client.setSessionInvalid(SessionData.session.getAuthToken());
+ } catch (TException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
con.closeThriftConnection();
System.exit(0);
}
@@ -430,7 +427,7 @@ public class SearchImage_GUI extends JFrame { try {
// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
// Server
- List<String> list = client.getAllOS();
+ List<String> list = client.getAllOS(SessionData.session.getAuthToken());
// Leeres Item hinzufuegen
comboBox.addItem("");
for (int i = 0; i < list.size(); i++) {
@@ -1024,7 +1021,7 @@ public class SearchImage_GUI extends JFrame { //get complete list
images = client.getImageList(person.verantwortlicher.getUserID());
} else {
- images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());
+ images = client.getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
}
Iterator<server.generated.Image> i = images.iterator();
@@ -1069,7 +1066,7 @@ public class SearchImage_GUI extends JFrame { List<server.generated.Image> images;
try {
// Hole eine Liste der Images
- images = client.getImageList(person.verantwortlicher.getUserID());
+ images = client.getImageList(SessionData.session.getAuthToken());
Iterator<server.generated.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1117,7 +1114,7 @@ public class SearchImage_GUI extends JFrame { List<server.generated.Image> images;
try {
// Hole eine Liste der Images
- images = client.getImageListAllTemplates();
+ images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
Iterator<server.generated.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1183,7 +1180,7 @@ public class SearchImage_GUI extends JFrame { try {
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- Map<String, String> res = client.getImageData(id, version);
+ Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
labelName.setText(res.get("name"));
labelOS.setText(res.get("os"));
labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
@@ -1210,7 +1207,7 @@ public class SearchImage_GUI extends JFrame { labelVersion.setText(res.get("version"));
textAreadesc.setText(res.get("desc"));
- List<String> contacts = client.getAdditionalImageContacts(id);
+ List<String> contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken());
labelWeitereVerantwortliche.setText("");
for (int i = 0; i < contacts.size(); i++)
{
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 17de8772..b875fb58 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -98,6 +98,7 @@ public class Login_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { + System.exit(0); } }); @@ -323,6 +324,7 @@ public class Login_GUI extends JFrame { LOGGER.info("Authentifizierung von '" + lblusername.getText() + "' erfolgreich."); user = client.getUserFromToken(result.authToken); authToken = result.authToken; + } catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) { setStatus( @@ -463,23 +465,28 @@ public class Login_GUI extends JFrame { server.generated.Server.Client client_2 = models.Client.clientcon.getClient(); try { - client_2.setTokenForSession(authToken); + boolean authenticated = client_2.authenticated(authToken); + + if(!authenticated) + { + //TODO message for user and deactivation of menu points, actually just system exit + System.exit(0); + } } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } try { - String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule()); + String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule(),SessionData.session.getAuthToken()); //LOGGER.info("Institution of user is: "+pk_institution); - client_2.setPerson(person.verantwortlicher.getUserID(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), pk_institution); + client_2.setPerson(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken(),pk_institution); //LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - // Pruefe ob Bills Of Rights schon akzeptiert wurden, // wenn nicht zeige diese an if (!Config.getBillOfRights()) { diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index bd69571e..01b4aaeb 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -58,6 +58,7 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; +import server.generated.Server.Client; import util.GuiOrganizer; import util.News; import util.OpenLinks; @@ -84,6 +85,8 @@ public class MainMenue_GUI extends JFrame { private final ButtonGroup buttonGroup = new ButtonGroup(); private JMenuItem mntmAbout; Component c = null; + + Client client = models.Client.clientcon.getClient(); @@ -94,7 +97,7 @@ public class MainMenue_GUI extends JFrame { // for testing ImageRights imageRights = new ImageRights(); - + boolean tokenDeleted; public MainMenue_GUI(Component formerGUI) { @@ -102,7 +105,18 @@ public class MainMenue_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - System.exit(0); + try { + tokenDeleted = client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + if(tokenDeleted) + { + System.out.println("test"); + System.exit(0); + } + } }); try { diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java index 9f2c56d1..9ea9f779 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java @@ -39,10 +39,14 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import org.apache.thrift.TException; + import models.Image; import models.Lecture; import models.Links; +import models.SessionData; import models.person; +import server.generated.Server.Client; import util.GuiOrganizer; import util.OpenLinks; @@ -68,6 +72,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { Date startDate = new Date(); Date endDate; Component c = null; + Client client = models.Client.clientcon.getClient(); private boolean descriptionLengthOK = false; // description may not be // longer than // MAX_DESCRIPTION_LENGTH @@ -90,6 +95,12 @@ public class CreateLectureAllgemein_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 8559c68a..2549e60f 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -136,13 +136,7 @@ public class CreateLectureLink_GUI extends JFrame { * Create the dialog. */ public CreateLectureLink_GUI(Component formerGUI) { - - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } + filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -150,6 +144,12 @@ public class CreateLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); System.exit(0); } @@ -303,7 +303,7 @@ public class CreateLectureLink_GUI extends JFrame { comboBox = new JComboBox<String>(); try { - List<String> list = client.getAllOS(); + List<String> list = client.getAllOS(SessionData.session.getAuthToken()); comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); @@ -464,26 +464,22 @@ public class CreateLectureLink_GUI extends JFrame { formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imageID, - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - uuid); + uuid, + person.verantwortlicher.getHochschule()); System.out.println("imageID" + " " + imageID); System.out.println("lectureID" + " " + uuid); //set rights for this user client.writeLectureRights( uuid, - person.verantwortlicher.getUsername(), - person.verantwortlicher.getName(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getEMail(), + person.verantwortlicher.getRole(), + SessionData.session.getAuthToken(), person.verantwortlicher.getHochschule(), - person.verantwortlicher.getRole()); + person.verantwortlicher.getUserID() + ); //set rights for additional users for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){ @@ -493,7 +489,8 @@ public class CreateLectureLink_GUI extends JFrame { RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(), - RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin() + RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(), + SessionData.session.getAuthToken() ); }//end for @@ -744,7 +741,7 @@ public class CreateLectureLink_GUI extends JFrame { try { - uuid = client.createRandomUUID(); + uuid = client.createRandomUUID(SessionData.session.getAuthToken()); } catch (TException e1) { @@ -766,7 +763,7 @@ public class CreateLectureLink_GUI extends JFrame { //get complete list images = client.getImageList(person.verantwortlicher.getUserID()); } else { - images = client.getImageListPermissionLink(person.verantwortlicher.getUserID()); + images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); } Iterator<server.generated.Image> i = images.iterator(); @@ -818,7 +815,7 @@ public class CreateLectureLink_GUI extends JFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getImageData(id, version); + Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 58fadc72..6d908413 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -107,20 +107,13 @@ public class DeleteLecture_GUI extends JFrame { + "</div></html>"; RowFilter rf = null; - List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>( - 2); + List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2); /** * Create the dialog. */ public DeleteLecture_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -129,6 +122,12 @@ public class DeleteLecture_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); System.exit(0); } @@ -152,6 +151,7 @@ public class DeleteLecture_GUI extends JFrame { // 6=Image // 7=Schlagwort // 8=ID + tablemyLectures.getColumnModel().getColumn(1).setWidth(0); tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0); tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0); @@ -176,10 +176,12 @@ public class DeleteLecture_GUI extends JFrame { tablemyLectures.addMouseListener(new MouseAdapter() { @Override - public void mouseReleased(MouseEvent e) { + public void mouseReleased(MouseEvent e) + { tablemyLectures.clearSelection(); //just one row is selectablemyLectures tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); + System.out.println(tablemyLectures.getSelectedRow()); } }); @@ -201,7 +203,7 @@ public class DeleteLecture_GUI extends JFrame { // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); setLocationRelativeTo(formerGUI); - + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -210,8 +212,7 @@ public class DeleteLecture_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Zu löschende Veranstaltung wählen"); + JLabel lblNewLabel = new JLabel("Zu löschende Veranstaltung wählen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -238,7 +239,7 @@ public class DeleteLecture_GUI extends JFrame { panel_1.setBounds(10, 49, 557, 64); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); @@ -379,14 +380,22 @@ public class DeleteLecture_GUI extends JFrame { lectureID = modelMyLectures .getValueAt( tablemyLectures - .convertColumnIndexToModel(tablemyLectures - .getSelectedRow()), 8) - .toString(); + .convertRowIndexToModel(tablemyLectures + .getSelectedRow()), + 8).toString(); + + //int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()); + + // LOGGER.info("Lösche Veranstaltung: " + lectureID); try { - if (client.deleteLecture(lectureID, - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getUsername())) { + if (client.deleteLecture( + lectureID, + SessionData.session.getAuthToken(), + person.verantwortlicher.getHochschule() + ) + ) + { // delete successful LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht."); @@ -615,15 +624,17 @@ public class DeleteLecture_GUI extends JFrame { throws ParseException { List<server.generated.Lecture> lectures; try { - // Hole eine Liste der erlaubten Images für die diese Person - if(person.verantwortlicher.getRole()=="Admin"){ + if(person.verantwortlicher.getRole()=="Admin") + { //get complete list - lectures = client.getLectureList(); - } else { + lectures = client.getLectureList(SessionData.session.getAuthToken()); + } + else + { //get permitted list - lectures = client.getLectureListPermissionAdmin(person.verantwortlicher.getUserID()); + lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken()); } Iterator<server.generated.Lecture> i = lectures.iterator(); @@ -648,12 +659,12 @@ public class DeleteLecture_GUI extends JFrame { i.next(); } - return model; } catch (TException e1) { e1.printStackTrace(); } + return model; } @@ -677,7 +688,7 @@ public class DeleteLecture_GUI extends JFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getLectureData(id); + Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java index 1d144c89..eae7a49c 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java @@ -47,6 +47,7 @@ import models.Image; import models.ItemOwner; import models.Lecture; import models.Links; +import models.SessionData; //import models.person; import models.person; @@ -99,6 +100,12 @@ public class EditLectureAllgemein_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } }); @@ -498,7 +505,7 @@ public class EditLectureAllgemein_GUI extends JFrame { //check which GUI to open try { - if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid())){ + if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){ //user is admin of the lecture PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c); ev.setVisible(true); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index d1fe57e3..a92b2dec 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -150,16 +150,16 @@ public class EditLectureLink_GUI extends JFrame { */ public EditLectureLink_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); System.exit(0); } @@ -416,7 +416,7 @@ public class EditLectureLink_GUI extends JFrame { comboBox = new JComboBox<String>(); try { - List<String> list = client.getAllOS(); + List<String> list = client.getAllOS(SessionData.session.getAuthToken()); comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); @@ -630,7 +630,7 @@ public class EditLectureLink_GUI extends JFrame { //check which GUI to open try { - if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid())){ + if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){ //user is admin of the lecture PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c); ev.setVisible(true); @@ -692,19 +692,17 @@ public class EditLectureLink_GUI extends JFrame { .convertRowIndexToModel(tablemyImages .getSelectedRow()), 7).toString(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid()); + Lecture.lecture.getid(), + person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage client.deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), + SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -741,7 +739,8 @@ public class EditLectureLink_GUI extends JFrame { .get(i).isLecture_write(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isLecture_admin()// admin + .get(i).isLecture_admin(),// admin + SessionData.session.getAuthToken() ); }// end for @@ -810,19 +809,17 @@ public class EditLectureLink_GUI extends JFrame { .convertRowIndexToModel(tablePublicVorlagen .getSelectedRow()), 7).toString(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid()); + Lecture.lecture.getid(), + person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage client.deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), + SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -853,7 +850,8 @@ public class EditLectureLink_GUI extends JFrame { .get(i).isImageWrite(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageAdmin()// admin + .get(i).isImageAdmin(),// admin + SessionData.session.getAuthToken() ); } @@ -918,19 +916,17 @@ public class EditLectureLink_GUI extends JFrame { .convertRowIndexToModel(tableAllImages .getSelectedRow()), 7).toString(), - person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), + SessionData.session.getAuthToken(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Lecture.lecture.getid()); + Lecture.lecture.getid(), + person.verantwortlicher.getHochschule()); // remove all additional user permissions on // first stage client.deleteAllAdditionalLecturePermissions( Lecture.lecture.getid(), + SessionData.session.getAuthToken(), person.verantwortlicher.getUserID()); // then, add user permissions as they have been @@ -961,7 +957,8 @@ public class EditLectureLink_GUI extends JFrame { .get(i).isImageWrite(),// write RightsManagement.rightsManagement .getPermittedUserList() - .get(i).isImageAdmin()// admin + .get(i).isImageAdmin(),// admin + SessionData.session.getAuthToken() ); } @@ -1224,7 +1221,7 @@ public class EditLectureLink_GUI extends JFrame { } else { //get permitted list images = client.getImageListPermissionLink(person.verantwortlicher - .getUserID()); + .getUserID(),SessionData.session.getAuthToken()); } Iterator<server.generated.Image> i = images.iterator(); @@ -1260,7 +1257,7 @@ public class EditLectureLink_GUI extends JFrame { // Hole eine Liste der Images //images = client.getImageListPermissionLink(person.verantwortlicher.getUserID()); - images = client.getImageListAllTemplates(); + images = client.getImageListAllTemplates(SessionData.session.getAuthToken()); Iterator<server.generated.Image> i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1312,7 +1309,7 @@ public class EditLectureLink_GUI extends JFrame { try { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getImageData(id, version); + Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index 6131350c..92981146 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java @@ -114,12 +114,6 @@ public class EditLectureSearch_GUI extends JFrame { */ public EditLectureSearch_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -128,6 +122,12 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); System.exit(0); } @@ -665,10 +665,10 @@ public class EditLectureSearch_GUI extends JFrame { // Hole eine Liste der erlaubten Images für die diese Person if(person.verantwortlicher.getRole()=="Admin"){ //get complete list - lectures = client.getLectureList(); + lectures = client.getLectureList(SessionData.session.getAuthToken()); } else { //get permitted list - lectures = client.getLectureListPermissionWrite(person.verantwortlicher.getUserID()); + lectures = client.getLectureListPermissionWrite(SessionData.session.getAuthToken()); } Iterator<server.generated.Lecture> i = lectures.iterator(); @@ -724,7 +724,7 @@ public class EditLectureSearch_GUI extends JFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map<String, String> res = client.getLectureData(id); + Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); @@ -742,7 +742,7 @@ public class EditLectureSearch_GUI extends JFrame { try { // get values from server and set them in model - map = client.getItemOwner(lectureid); + map = client.getItemOwner(lectureid,SessionData.session.getAuthToken()); ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index 2fb0cc7a..f32648f0 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -1,7 +1,6 @@ package gui.lecture; import gui.intro.About_GUI; -import gui.intro.ListAllOtherUsers_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -64,6 +63,7 @@ import org.apache.thrift.TException; import server.generated.Person; import server.generated.Server.Client; import util.CheckIntegrity; +import util.ListAllOtherUsers_GUI; import util.OpenLinks; @SuppressWarnings("serial") @@ -123,16 +123,16 @@ public class PermissionCreateLecture_GUI extends JFrame { public PermissionCreateLecture_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } }); diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index db947b27..52e9746a 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -2,7 +2,6 @@ package gui.lecture; import gui.image.PermissionCreateImage_GUI; import gui.intro.About_GUI; -import gui.intro.ListAllOtherUsers_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -59,6 +58,7 @@ import models.person; import server.generated.Person; import server.generated.Server.Client; import util.CheckIntegrity; +import util.ListAllOtherUsers_GUI; import util.OpenLinks; import javax.swing.JCheckBox; @@ -106,16 +106,16 @@ public class PermissionEditLecture_GUI extends JFrame { public PermissionEditLecture_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.exit(0); } }); @@ -239,8 +239,8 @@ public class PermissionEditLecture_GUI extends JFrame { try { map = client.getPermissionForUserAndLecture( - person.verantwortlicher.getUserID(), - Lecture.lecture.getid()); + SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID() + ); Iterator<server.generated.Person> i = map.iterator(); 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 7401dc1c..fc00997f 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -119,13 +119,7 @@ public class SearchLecture_GUI extends JFrame { * Create the dialog.
*/
public SearchLecture_GUI(Component formerGUI) {
-
- try {
- client.setTokenForSession(SessionData.session.getAuthToken());
- } catch (TException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
+
filters.add(RowFilter.regexFilter(".", 0));
rf = RowFilter.orFilter(filters);
@@ -136,6 +130,12 @@ public class SearchLecture_GUI extends JFrame { public void windowClosing(WindowEvent arg0) {
// Beendet die Anwendung nach klick auf X
con.closeThriftConnection();
+ try {
+ client.setSessionInvalid(SessionData.session.getAuthToken());
+ } catch (TException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
System.exit(0);
}
@Override
@@ -633,10 +633,10 @@ public class SearchLecture_GUI extends JFrame { // Hole eine Liste der erlaubten Images für die diese Person
if(person.verantwortlicher.getRole()=="Admin"){
//get complete list
- lectures = client.getLectureList();
+ lectures = client.getLectureList(SessionData.session.getAuthToken());
} else {
//get permitted list
- lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());
+ lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());
}
Iterator<server.generated.Lecture> i = lectures.iterator();
@@ -675,7 +675,7 @@ public class SearchLecture_GUI extends JFrame { try {
// Hole eine Liste der erlaubten Images für die diese Person
//lectures = client.getLectureList();
- lectures = client.getLectureList();
+ lectures = client.getLectureList(SessionData.session.getAuthToken());
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");
@@ -726,7 +726,7 @@ public class SearchLecture_GUI extends JFrame { SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- Map<String,String> res=client.getLectureData(id);
+ Map<String,String> res=client.getLectureData(id,SessionData.session.getAuthToken());
labelName.setText(res.get("name"));
labelAktiv.setText(res.get("isActive"));
labeldesc.setText(res.get("desc"));
diff --git a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java index 7c1259f9..a5df03c2 100644 --- a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java +++ b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java @@ -35,7 +35,7 @@ public class MasterThriftConnection { return client; } - + public void closeMasterThriftConnection() { transport.close(); } diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java index 50315ae5..8b0221e8 100644 --- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java +++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java @@ -49,6 +49,7 @@ public class ThriftConnection { public void closeThriftConnection() { + //System.out.println("Ich funktioniere auch, wenn ich nicht geschlossen, sondern im TaskManager gekillt werde"); //works LOGGER.info("Verbindung wird geplant getrennt."); transport.close(); } diff --git a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java index 4c24e035..ae097426 100644 --- a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java +++ b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java @@ -1,29 +1,22 @@ -package gui.intro; +package util; import gui.intro.About_GUI; -import gui.intro.MainMenue_GUI; -import java.awt.Color; import java.awt.Component; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.net.URI; import java.net.URISyntaxException; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Map; import javax.swing.DefaultListSelectionModel; import javax.swing.JButton; @@ -34,25 +27,20 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JSeparator; import javax.swing.JTable; -import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; -import javax.swing.RowFilter; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Links; +import models.SessionData; import models.person; import org.apache.log4j.Logger; @@ -61,8 +49,6 @@ import org.apache.thrift.TException; import server.generated.Person; import server.generated.Server.Client; import thrift.ThriftConnection; -import util.OpenLinks; -import javax.swing.ListSelectionModel; @SuppressWarnings("serial") public class ListAllOtherUsers_GUI extends JFrame { @@ -376,7 +362,7 @@ public class ListAllOtherUsers_GUI extends JFrame { } //get the info - map = client.getAllOtherSatelliteUsers(user); + map = client.getAllOtherSatelliteUsers(user,SessionData.session.getAuthToken()); Iterator<server.generated.Person> i = map.iterator(); int x = 0; diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 1671b893..d9a663c4 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -28,8 +28,10 @@ import server.generated.User; import org.openslx.imagemaster.thrift.iface.ImageServer.Client; import org.openslx.imagemaster.thrift.iface.InvalidTokenException; +import org.openslx.imagemaster.thrift.iface.UserInfo; + import thrift.MasterThriftConnection; -import thrift.SessionData; +//import thrift.SessionData; import sql.SQL; //import util.XMLCreator; @@ -39,57 +41,73 @@ public class ServerHandler implements Server.Iface private static Logger log = Logger.getLogger(ServerHandler.class); static SQL sql = new SQL(); - Client client = null; + + private Map<String,UserInfo> tokenManager = new HashMap<>(); //saves the current tokens and the mapped userdata, returning from the server - - public void setTokenForSession(String token) - { - SessionData.session.setAuthToken(token); - } - public boolean checkSession(String authToken) throws InvalidTokenException - { - //cached proof. if session is valid, return - if(SessionData.session.getAuthToken().equals(authToken)) + + public boolean authenticated(String token) throws TException + { + if(tokenManager.get(token) != null) { + //user found in tokenManager, session was set to valid once before (cached session, no further action needed) return true; } + else + { + MasterThriftConnection thrift = new MasterThriftConnection(); + Client client = thrift.getMasterThriftConnection(); + + //user not in tokenManager, check authentication, then add user to tokenManager + log.info("token is: "+token); + UserInfo ui = null; + if( (ui = client.getUserFromToken(token)) != null) //user authenticated by masterserver + { + //user was authenticated by the masterserver, cache the data + tokenManager.put(token, ui); + return true; + } + } - //else, set session to current token and check against masterserver - //TODO change calls from functions - SessionData.session.setAuthToken(authToken); - - return authenticated(); + return false; + } + + + private UserInfo getUserFromToken(String token) //local function, which gets userdata from the tokenmanager, not the masterserver + { //implemented, as there is no need for userdata in each function, so return type of authenticated should stay boolean + UserInfo ui = tokenManager.get(token); + return ui; } - public boolean authenticated() throws InvalidTokenException + public boolean setSessionInvalid(String token) { - //start initial authentication with the masterserver - MasterThriftConnection thrift = new MasterThriftConnection(); - client = thrift.getMasterThriftConnection(); - try { - if(client.getUserFromToken(SessionData.session.getAuthToken()) != null) - { - return true; - } - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info("User not authenticated."); - + log.info("token disabling.. round one"); + log.info(tokenManager.get(token)); + + + tokenManager.remove(token); + + log.info("token disabling.. round two"); + log.info(tokenManager.get(token)); + + if(tokenManager.get(token) == null) //check if deletion worked and token isn't stored anymore + { + return true; + } return false; } + + @Override - public User getFtpUser() throws TException + public User getFtpUser(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { log.info("returning FTPUser..."); User user = new User(); @@ -200,20 +218,22 @@ public class ServerHandler implements Server.Iface return null; } + @Override - public long DeleteFtpUser(String user) throws TException + public long DeleteFtpUser(String user, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.DeleteUser(user); } return -1; } + @Override - public String getPathOfImage(String image_id, String version) throws TException + public String getPathOfImage(String image_id, String version, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { log.info("successfully returned PathOfImage: " + sql.getPathOfImage(image_id, version)); return sql.getPathOfImage(image_id, version); @@ -223,26 +243,26 @@ public class ServerHandler implements Server.Iface @Override - public String setInstitution(String university) throws InvalidTokenException + public String setInstitution(String university, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { - return sql.setInstitution(university); + return sql.setInstitution(university); } return null; } @Override - public boolean writeVLdata(String imagename, String desc, String login, - String firstname, String lastname, String university, String Mail, + public boolean writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, - long filesize, long shareMode, String os, String uid) throws TException + long filesize, long shareMode, String os, String uid, String token, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { String mode = null; + if (shareMode == 0) { mode = "only_local"; @@ -264,9 +284,12 @@ public class ServerHandler implements Server.Iface // sql.setImageData(pk_person, license, internet, cpu, ram, // imagename,desc, imagePath, filesize,mode,pk_os); - sql.setImageData(login, license, internet, cpu, ram, imagename, desc, + + + sql.setImageData(userID, license, internet, cpu, ram, imagename, desc, imagePath, filesize, mode, pk_os, uid); + log.info("userID in serverhandler was: "+userID); log.info("written VLdata"); return true; } @@ -275,9 +298,9 @@ public class ServerHandler implements Server.Iface @Override - public List<Image> getImageListPermissionWrite(String userID) throws TException + public List<Image> getImageListPermissionWrite(String userID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getImageListPermissionWrite(userID); } @@ -286,9 +309,9 @@ public class ServerHandler implements Server.Iface @Override - public List<Image> getImageListPermissionRead(String userID) throws TException + public List<Image> getImageListPermissionRead(String userID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getImageListPermissionRead(userID); } @@ -297,9 +320,9 @@ public class ServerHandler implements Server.Iface @Override - public List<Image> getImageListPermissionLink(String userID) throws TException + public List<Image> getImageListPermissionLink(String userID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getImageListPermissionLink(userID); } @@ -308,9 +331,9 @@ public class ServerHandler implements Server.Iface @Override - public List<Image> getImageListPermissionAdmin(String userID) throws TException + public List<Image> getImageListPermissionAdmin(String userID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getImageListPermissionAdmin(userID); } @@ -318,9 +341,9 @@ public class ServerHandler implements Server.Iface } @Override - public List<Image> getImageListAllTemplates() throws TException + public List<Image> getImageListAllTemplates(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getImageListAllTemplates(); } @@ -329,48 +352,72 @@ public class ServerHandler implements Server.Iface @Override - public List<String> getAllOS() throws TException + public List<String> getAllOS(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getAllOS(); } return null; } + //UserInfo does not return the institution, so in this case, the local method is prepared, but not yet executed, as the institution has to be added to UserInfo (or selected by institutionID) @Override - public Map<String, String> getPersonData(String Vorname, String Nachname) throws TException + public Map<String, String> getPersonData(String Vorname, String Nachname, String token) throws TException { - if(authenticated()) + /* + if(authenticated(token)) { return sql.getPersonData(Vorname, Nachname); } return null; + */ + + Map<String, String> map = new HashMap<>(); + + UserInfo ui = getUserFromToken(token); + + map.put("mail", ui.getEMail()); + map.put("Nachname", ui.getLastName()); + map.put("Vorname", ui.getFirstName()); + + //map.put("Hochschule", sql.getInstitutionByID(ui.getOrganizationId())); //does not deliver the correct id + Map<String, String> tempMap = new HashMap<>(); + tempMap = sql.getPersonData(Vorname, Nachname); + map.put("Hochschule", tempMap.get("Hochschule")); + + return map; + } - - public void setPerson(String login, String lastname, String firstname,String mail, String Institution) throws InvalidTokenException + + public void setPerson(String userID, String token, String institution) throws TException { - if(authenticated()) + if(authenticated(token)) { - sql.setPerson(login, lastname, firstname, mail, new Date(), Institution); + UserInfo ui = getUserFromToken(token); + //String institution = sql.getInstitutionByID(ui.getOrganizationId()); + sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), institution); } } + + @Override public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, - String imageID, String login, String firstname, String lastname, - String university, String Mail, String Tel, String Fak, String lectureID) + String imageID, String token, String Tel, String Fak, String lectureID, String university) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); //String pk_image = imageID; Map<String, String> map = new HashMap<String, String>(); int imageversion = 0; + //String university = sql.getInstitutionByID(ui.getOrganizationId()); String pk_institution = sql.setInstitution(university); - String pk_person = sql.setPerson(login, lastname, firstname, Mail, + String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution); map = sql.getImageIDandVersion(imageID); @@ -387,9 +434,9 @@ public class ServerHandler implements Server.Iface @Override - public boolean startFileCopy(String filename) throws TException + public boolean startFileCopy(String filename, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { // copy file from folder temp to folder prod String file = Configuration.config.getAbsolute_path() + "temp/" @@ -416,9 +463,9 @@ public class ServerHandler implements Server.Iface } @Override - public Map<String, String> getImageData(String imageid, String imageversion) throws TException + public Map<String, String> getImageData(String imageid, String imageversion, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { //log.info("returning ImageData: "+ sql.getImageData(imageid, imageversion).size() + "items."); return sql.getImageData(imageid, imageversion); @@ -430,9 +477,9 @@ public class ServerHandler implements Server.Iface public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, - long filesize, long shareMode, String os) throws TException + long filesize, long shareMode, String os, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { String mode = null; @@ -449,11 +496,12 @@ public class ServerHandler implements Server.Iface } return false; } + @Override - public List<Lecture> getLectureList() throws TException + public List<Lecture> getLectureList(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { //log.info("returning LectureList"); return sql.getLectureList(); @@ -462,35 +510,38 @@ public class ServerHandler implements Server.Iface } @Override - public List<Lecture> getLectureListPermissionRead(String userID) throws InvalidTokenException + public List<Lecture> getLectureListPermissionRead(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); //log.info("returning LectureListRead"); - return sql.getLectureListPermissionRead(userID); + return sql.getLectureListPermissionRead(ui.getUserId()); } return null; }// end getLectureListPermissionRead @Override - public List<Lecture> getLectureListPermissionWrite(String userID) throws InvalidTokenException + public List<Lecture> getLectureListPermissionWrite(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); //log.info("returning LectureListWrite"); - return sql.getLectureListPermissionWrite(userID); + return sql.getLectureListPermissionWrite(ui.getUserId()); } return null; }// end getLectureListPermissionRead @Override - public List<Lecture> getLectureListPermissionAdmin(String userID) throws InvalidTokenException + public List<Lecture> getLectureListPermissionAdmin(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); //log.info("returning LectureListAdmin"); - return sql.getLectureListPermissionAdmin(userID); + return sql.getLectureListPermissionAdmin(ui.getUserId()); } return null; }// end getLectureListPermissionRead @@ -499,20 +550,22 @@ public class ServerHandler implements Server.Iface @Override public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, - boolean isActive, String imageid, String imageversion, String user, - String firstname, String lastname, String university, String Mail, - String Tel, String Fak, String id) throws TException + boolean isActive, String imageid, String imageversion, String token, + String Tel, String Fak, String id, String university) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); + Map<String, String> map = new HashMap<String, String>(); map = sql.getDeleteXMLData(id); - sql.updateLectureData(imageid, imageversion, lastname, newName, desc, + sql.updateLectureData(imageid, imageversion, ui.getLastName(), newName, desc, shortdesc, startDate, endDate, isActive, id); + String path = Configuration.config.getAbsolute_path() + "prod/" + map.get("date").substring(0, map.get("date").length() - 2) - + "_" + university + "_" + user + "_" + map.get("name") + + "_" + university + "_" + ui.getEMail() + "_" + map.get("name") + ".xml"; File tmpFile = new File(path); try { @@ -526,9 +579,9 @@ public class ServerHandler implements Server.Iface @Override - public boolean deleteImageServer(String imageid, String imageversion) throws TException + public boolean deleteImageServer(String imageid, String imageversion, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { String stringFile = sql.getFile(imageid, imageversion); log.info("File to Delete: " + stringFile); @@ -552,11 +605,11 @@ public class ServerHandler implements Server.Iface @Override - public boolean deleteImageData(String id, String version) throws TException + public boolean deleteImageData(String id, String version, String token) throws TException { boolean success=false; - if(authenticated()) + if(authenticated(token)) { if(sql.deleteImage(id, version)==true) { @@ -568,20 +621,24 @@ public class ServerHandler implements Server.Iface } @Override - public boolean connectedToLecture(String id, String version) throws TException + public boolean connectedToLecture(String id, String version, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.connectedToLecture(id, version); } return true; } - public boolean deleteLecture(String id, String hs, String user) throws InvalidTokenException + public boolean deleteLecture(String id, String token, String university) throws TException { boolean success = false; - if(authenticated()) + UserInfo ui = getUserFromToken(token); + + String user = ui.getEMail(); + + if(authenticated(token)) { Map<String, String> map = new HashMap<String, String>(); map = sql.getDeleteXMLData(id); @@ -591,7 +648,7 @@ public class ServerHandler implements Server.Iface + "prod/" + map.get("date") .substring(0, map.get("date").length() - 2) + "_" - + hs + "_" + user + "_" + map.get("name") + ".xml"; + + university + "_" + user + "_" + map.get("name") + ".xml"; File xmlFile = new File(path); FileUtils.forceDelete(xmlFile); } catch (IOException e) { @@ -608,9 +665,9 @@ public class ServerHandler implements Server.Iface } @Override - public List<String> getAllUniversities() throws TException + public List<String> getAllUniversities(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getAllUniversities(); } @@ -618,9 +675,9 @@ public class ServerHandler implements Server.Iface } @Override - public Map<String, String> getLectureData(String lectureid) throws TException + public Map<String, String> getLectureData(String lectureid, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { //log.info("returning LectureData"); return sql.getLectureData(lectureid); @@ -628,13 +685,13 @@ public class ServerHandler implements Server.Iface return null; } - public static int nthIndexOf(final String string, final String token,final int index) + public static int nthIndexOf(final String string, final String searchToken,final int index) { int j = 0; for (int i = 0; i < index; i++) { - j = string.indexOf(token, j + 1); + j = string.indexOf(searchToken, j + 1); if (j == -1) break; } @@ -643,9 +700,9 @@ public class ServerHandler implements Server.Iface } @Override - public boolean checkUser(String username) throws TException + public boolean checkUser(String username, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.checkUser(username); } @@ -654,36 +711,35 @@ public class ServerHandler implements Server.Iface } @Override - public boolean createUser(String loginName, String lastName,String firstName, String mail, String university) throws TException + public boolean createUser(String token, String university) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); String pk_institution = sql.setInstitution(university); - String pk_person = sql.setPerson(loginName, lastName, firstName, mail, new Date(), pk_institution); + String pk_person = sql.setPerson(ui.getEMail(), ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution); return true; } return false; } @Override - public boolean writeImageRights(String imageID, String username, - String lastName, String firstName, String mail, String university, - String role) throws TException + public boolean writeImageRights(String imageID, String token, + String role, String university, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); String pk_image = null; Map<String, String> map = new HashMap<String, String>(); - int imageversion = 0; + String pk_institution = sql.setInstitution(university); - String pk_person = sql.setPerson(username, lastName, firstName, mail, - new Date(), pk_institution); + String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution); map = sql.getImageIDandVersion(imageID); pk_image = map.get("GUID"); - imageversion = Integer.parseInt(map.get("version")); if (role.equals("Dozent")) { int read = 1; @@ -725,17 +781,14 @@ public class ServerHandler implements Server.Iface } @Override - public boolean writeLectureRights(String lectureID, String username, - String lastName, String firstName, String mail, String university, - String role) throws TException + public boolean writeLectureRights(String lectureID, String role, String token, String university, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { //String pk_lecture = null; - + UserInfo ui = getUserFromToken(token); String pk_institution = sql.setInstitution(university); - String pk_person = sql.setPerson(username, lastName, firstName, mail, - new Date(), pk_institution); + String pk_person = sql.setPerson(userID, ui.getLastName(), ui.getFirstName(), ui.getEMail(), new Date(), pk_institution); //pk_lecture = sql.getLectureID(lectureID); if (role.equals("Dozent")) { @@ -774,9 +827,9 @@ public class ServerHandler implements Server.Iface } @Override - public List<Person> getAllOtherSatelliteUsers(List<String> userID) throws TException + public List<Person> getAllOtherSatelliteUsers(List<String> userID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getAllOtherSatelliteUsers(userID); // return null; @@ -787,10 +840,10 @@ public class ServerHandler implements Server.Iface //set permissions for users which are !=userID public boolean writeAdditionalImageRights(String imageID, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, - boolean isAdmin) throws InvalidTokenException + boolean isAdmin, String token) throws TException { boolean success = false; - if(authenticated()) + if(authenticated(token)) { Map<String, String> map = new HashMap<String, String>(); @@ -806,9 +859,9 @@ public class ServerHandler implements Server.Iface public boolean writeAdditionalLectureRights(String lectureID, - String userID, boolean isRead, boolean isWrite, boolean isAdmin) throws InvalidTokenException + String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { Map<String, String> map = new HashMap<String, String>(); //String lectureID = sql.getLectureID(lectureID); @@ -823,40 +876,43 @@ public class ServerHandler implements Server.Iface } @Override - public List<Person> getPermissionForUserAndImage(String userID, - String imageID) throws TException + public List<Person> getPermissionForUserAndImage(String token, + String imageID, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getPermissionForUserAndImage(userID, imageID); } return null; } - public List<Person> getPermissionForUserAndLecture(String userID,String lectureID) throws InvalidTokenException + public List<Person> getPermissionForUserAndLecture(String token,String lectureID, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); return sql.getPermissionForUserAndLecture(userID, lectureID); } return null; } @Override - public void deleteAllAdditionalImagePermissions(String imageID,String userID) throws TException + public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); sql.deleteAllAdditionalImagePermissions(imageID, userID); } return; } @Override - public void deleteAllAdditionalLecturePermissions(String lectureID,String userID) throws TException + public void deleteAllAdditionalLecturePermissions(String lectureID,String token, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); sql.deleteAllAdditionalLecturePermissions(lectureID, userID); } @@ -864,19 +920,20 @@ public class ServerHandler implements Server.Iface } @Override - public List<Image> getImageList(String userID) throws TException + public List<Image> getImageList(String token) throws TException { - if(authenticated()) + UserInfo ui = getUserFromToken(token); + if(authenticated(token)) { - return sql.getImageList(userID); + return sql.getImageList(ui.getEMail()); } return null; } @Override - public List<String> getAdditionalImageContacts(String imageID) throws TException + public List<String> getAdditionalImageContacts(String imageID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getAdditionalImageContacts(imageID); } @@ -884,9 +941,9 @@ public class ServerHandler implements Server.Iface } @Override - public String getOsNameForGuestOs(String guestOS) throws TException + public String getOsNameForGuestOs(String guestOS, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getOsNameForGuestOs(guestOS); } @@ -895,18 +952,18 @@ public class ServerHandler implements Server.Iface @Override - public String createRandomUUID() throws TException + public String createRandomUUID(String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.createRandomUUID(); } return null; } - public Map<String, String> getItemOwner(String itemID) throws TException + public Map<String, String> getItemOwner(String itemID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.getItemOwner(itemID); } @@ -917,11 +974,12 @@ public class ServerHandler implements Server.Iface @Override - public boolean userIsImageAdmin(String userID, String imageID) + public boolean userIsImageAdmin(String imageID, String token, String userID) throws TException { - if(authenticated()) + if(authenticated(token)) { + UserInfo ui = getUserFromToken(token); return sql.userIsImageAdmin(userID,imageID); } return false; @@ -931,9 +989,9 @@ public class ServerHandler implements Server.Iface @Override - public boolean userIsLectureAdmin(String userID, String lectureID) + public boolean userIsLectureAdmin(String userID, String lectureID, String token) throws TException { - if(authenticated()) + if(authenticated(token)) { return sql.userIsLectureAdmin(userID,lectureID); } @@ -941,5 +999,14 @@ public class ServerHandler implements Server.Iface } + @Override + public String getInstitutionByID(String institutionID) throws TException { + // TODO Auto-generated method stub + return null; + } + + + + }// end class diff --git a/dozentenmodulserver/src/main/java/server/generated/Server.java b/dozentenmodulserver/src/main/java/server/generated/Server.java index 0b6092ad..831fd8cd 100644 --- a/dozentenmodulserver/src/main/java/server/generated/Server.java +++ b/dozentenmodulserver/src/main/java/server/generated/Server.java @@ -36,197 +36,205 @@ public class Server { public interface Iface { - public User getFtpUser() throws org.apache.thrift.TException; + public User getFtpUser(String token) throws org.apache.thrift.TException; - public void setTokenForSession(String token) throws org.apache.thrift.TException; + public boolean authenticated(String token) throws org.apache.thrift.TException; - public long DeleteFtpUser(String user) throws org.apache.thrift.TException; + public boolean setSessionInvalid(String token) throws org.apache.thrift.TException; - public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; + public long DeleteFtpUser(String user, String token) throws org.apache.thrift.TException; - public String setInstitution(String university) throws org.apache.thrift.TException; + public String getPathOfImage(String image_id, String version, String token) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid) throws org.apache.thrift.TException; + public String setInstitution(String university, String token) throws org.apache.thrift.TException; - public List<Image> getImageListPermissionWrite(String userID) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, String token, String userID) throws org.apache.thrift.TException; - public List<Image> getImageListPermissionRead(String userID) throws org.apache.thrift.TException; + public List<Image> getImageListPermissionWrite(String userID, String token) throws org.apache.thrift.TException; - public List<Image> getImageListPermissionLink(String userID) throws org.apache.thrift.TException; + public List<Image> getImageListPermissionRead(String userID, String token) throws org.apache.thrift.TException; - public List<Image> getImageListPermissionAdmin(String userID) throws org.apache.thrift.TException; + public List<Image> getImageListPermissionLink(String userID, String token) throws org.apache.thrift.TException; - public List<Image> getImageListAllTemplates() throws org.apache.thrift.TException; + public List<Image> getImageListPermissionAdmin(String userID, String token) throws org.apache.thrift.TException; - public List<Image> getImageList(String userID) throws org.apache.thrift.TException; + public List<Image> getImageListAllTemplates(String token) throws org.apache.thrift.TException; - public List<Lecture> getLectureList() throws org.apache.thrift.TException; + public List<Image> getImageList(String token) throws org.apache.thrift.TException; - public List<Lecture> getLectureListPermissionRead(String userID) throws org.apache.thrift.TException; + public List<Lecture> getLectureList(String token) throws org.apache.thrift.TException; - public List<Lecture> getLectureListPermissionWrite(String userID) throws org.apache.thrift.TException; + public List<Lecture> getLectureListPermissionRead(String token) throws org.apache.thrift.TException; - public List<Lecture> getLectureListPermissionAdmin(String userID) throws org.apache.thrift.TException; + public List<Lecture> getLectureListPermissionWrite(String token) throws org.apache.thrift.TException; - public List<String> getAllOS() throws org.apache.thrift.TException; + public List<Lecture> getLectureListPermissionAdmin(String token) throws org.apache.thrift.TException; - public List<String> getAllUniversities() throws org.apache.thrift.TException; + public List<String> getAllOS(String token) throws org.apache.thrift.TException; - public Map<String,String> getPersonData(String Vorname, String Nachname) throws org.apache.thrift.TException; + public List<String> getAllUniversities(String token) throws org.apache.thrift.TException; - public Map<String,String> getItemOwner(String itemID) throws org.apache.thrift.TException; + public Map<String,String> getPersonData(String Vorname, String Nachname, String token) throws org.apache.thrift.TException; - public void setPerson(String login, String lastname, String firstname, String mail, String Institution) throws org.apache.thrift.TException; + public Map<String,String> getItemOwner(String itemID, String token) throws org.apache.thrift.TException; - public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String lectureID) throws org.apache.thrift.TException; + public void setPerson(String userID, String token, String institution) throws org.apache.thrift.TException; - public boolean startFileCopy(String file) throws org.apache.thrift.TException; + public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String token, String Tel, String Fak, String lectureID, String university) throws org.apache.thrift.TException; - public Map<String,String> getImageData(String imageid, String imageversion) throws org.apache.thrift.TException; + public boolean startFileCopy(String file, String token) throws org.apache.thrift.TException; - public Map<String,String> getLectureData(String lectureid) throws org.apache.thrift.TException; + public Map<String,String> getImageData(String imageid, String imageversion, String token) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException; + public Map<String,String> getLectureData(String lectureid, String token) throws org.apache.thrift.TException; - public boolean deleteImageData(String id, String version) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, String token) throws org.apache.thrift.TException; - public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String user, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException; + public boolean deleteImageData(String id, String version, String token) throws org.apache.thrift.TException; - public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException; + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String token, String Tel, String Fak, String id, String university) throws org.apache.thrift.TException; - public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException; + public boolean deleteImageServer(String id, String version, String token) throws org.apache.thrift.TException; - public boolean deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException; + public boolean connectedToLecture(String id, String version, String token) throws org.apache.thrift.TException; - public boolean checkUser(String username) throws org.apache.thrift.TException; + public boolean deleteLecture(String id, String token, String university) throws org.apache.thrift.TException; - public boolean createUser(String loginName, String lastName, String firstName, String mail, String university) throws org.apache.thrift.TException; + public boolean checkUser(String username, String token) throws org.apache.thrift.TException; - public boolean writeImageRights(String imagename, String username, String lastName, String firstName, String mail, String university, String role) throws org.apache.thrift.TException; + public boolean createUser(String token, String university) throws org.apache.thrift.TException; - public boolean writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin) throws org.apache.thrift.TException; + public boolean writeImageRights(String imagename, String token, String role, String university, String userID) throws org.apache.thrift.TException; - public boolean writeLectureRights(String lecturename, String username, String lastName, String firstName, String mail, String university, String role) throws org.apache.thrift.TException; + public boolean writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, String token) throws org.apache.thrift.TException; - public boolean writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin) throws org.apache.thrift.TException; + public boolean writeLectureRights(String lectureID, String role, String token, String university, String userID) throws org.apache.thrift.TException; - public List<Person> getAllOtherSatelliteUsers(List<String> userID) throws org.apache.thrift.TException; + public boolean writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token) throws org.apache.thrift.TException; - public List<Person> getPermissionForUserAndImage(String userID, String imageID) throws org.apache.thrift.TException; + public List<Person> getAllOtherSatelliteUsers(List<String> userID, String token) throws org.apache.thrift.TException; - public List<String> getAdditionalImageContacts(String imageID) throws org.apache.thrift.TException; + public List<Person> getPermissionForUserAndImage(String token, String imageID, String userID) throws org.apache.thrift.TException; - public List<Person> getPermissionForUserAndLecture(String userID, String lectureID) throws org.apache.thrift.TException; + public List<String> getAdditionalImageContacts(String imageID, String token) throws org.apache.thrift.TException; - public void deleteAllAdditionalImagePermissions(String imageID, String userID) throws org.apache.thrift.TException; + public List<Person> getPermissionForUserAndLecture(String token, String lectureID, String userID) throws org.apache.thrift.TException; - public void deleteAllAdditionalLecturePermissions(String lectureID, String userID) throws org.apache.thrift.TException; + public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID) throws org.apache.thrift.TException; - public String getOsNameForGuestOs(String guestOS) throws org.apache.thrift.TException; + public void deleteAllAdditionalLecturePermissions(String lectureID, String token, String userID) throws org.apache.thrift.TException; - public boolean userIsImageAdmin(String userID, String imageID) throws org.apache.thrift.TException; + public String getOsNameForGuestOs(String guestOS, String token) throws org.apache.thrift.TException; - public boolean userIsLectureAdmin(String userID, String lectureID) throws org.apache.thrift.TException; + public boolean userIsImageAdmin(String imageID, String token, String userID) throws org.apache.thrift.TException; - public String createRandomUUID() throws org.apache.thrift.TException; + public boolean userIsLectureAdmin(String userID, String lectureID, String token) throws org.apache.thrift.TException; + + public String createRandomUUID(String token) throws org.apache.thrift.TException; + + public String getInstitutionByID(String institutionID) throws org.apache.thrift.TException; } public interface AsyncIface { - public void getFtpUser(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getFtpUser(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + public void authenticated(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void setTokenForSession(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void setSessionInvalid(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void DeleteFtpUser(String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void DeleteFtpUser(String user, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPathOfImage(String image_id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void setInstitution(String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void setInstitution(String university, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageListPermissionWrite(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageListPermissionWrite(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageListPermissionRead(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageListPermissionRead(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageListPermissionLink(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageListPermissionLink(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageListPermissionAdmin(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageListPermissionAdmin(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageListAllTemplates(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageListAllTemplates(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageList(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageList(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getLectureList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getLectureList(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getLectureListPermissionRead(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getLectureListPermissionRead(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getLectureListPermissionWrite(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getLectureListPermissionWrite(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getLectureListPermissionAdmin(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getLectureListPermissionAdmin(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getAllOS(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getAllOS(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getAllUniversities(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getAllUniversities(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPersonData(String Vorname, String Nachname, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPersonData(String Vorname, String Nachname, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getItemOwner(String itemID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getItemOwner(String itemID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void setPerson(String login, String lastname, String firstname, String mail, String Institution, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void setPerson(String userID, String token, String institution, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String token, String Tel, String Fak, String lectureID, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void startFileCopy(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void startFileCopy(String file, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageData(String imageid, String imageversion, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getLectureData(String lectureid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getLectureData(String lectureid, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteImageData(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteImageData(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String user, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String token, String Tel, String Fak, String id, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteImageServer(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void connectedToLecture(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteLecture(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteLecture(String id, String token, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void checkUser(String username, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void checkUser(String username, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void createUser(String loginName, String lastName, String firstName, String mail, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void createUser(String token, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeImageRights(String imagename, String username, String lastName, String firstName, String mail, String university, String role, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeImageRights(String imagename, String token, String role, String university, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeLectureRights(String lecturename, String username, String lastName, String firstName, String mail, String university, String role, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeLectureRights(String lectureID, String role, String token, String university, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getAllOtherSatelliteUsers(List<String> userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getAllOtherSatelliteUsers(List<String> userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPermissionForUserAndImage(String userID, String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPermissionForUserAndImage(String token, String imageID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getAdditionalImageContacts(String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getAdditionalImageContacts(String imageID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPermissionForUserAndLecture(String userID, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPermissionForUserAndLecture(String token, String lectureID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteAllAdditionalImagePermissions(String imageID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteAllAdditionalLecturePermissions(String lectureID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteAllAdditionalLecturePermissions(String lectureID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getOsNameForGuestOs(String guestOS, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getOsNameForGuestOs(String guestOS, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void userIsImageAdmin(String userID, String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void userIsImageAdmin(String imageID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void userIsLectureAdmin(String userID, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void userIsLectureAdmin(String userID, String lectureID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void createRandomUUID(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void createRandomUUID(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + public void getInstitutionByID(String institutionID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -250,15 +258,16 @@ public class Server { super(iprot, oprot); } - public User getFtpUser() throws org.apache.thrift.TException + public User getFtpUser(String token) throws org.apache.thrift.TException { - send_getFtpUser(); + send_getFtpUser(token); return recv_getFtpUser(); } - public void send_getFtpUser() throws org.apache.thrift.TException + public void send_getFtpUser(String token) throws org.apache.thrift.TException { getFtpUser_args args = new getFtpUser_args(); + args.setToken(token); sendBase("getFtpUser", args); } @@ -272,36 +281,63 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getFtpUser failed: unknown result"); } - public void setTokenForSession(String token) throws org.apache.thrift.TException + public boolean authenticated(String token) throws org.apache.thrift.TException { - send_setTokenForSession(token); - recv_setTokenForSession(); + send_authenticated(token); + return recv_authenticated(); } - public void send_setTokenForSession(String token) throws org.apache.thrift.TException + public void send_authenticated(String token) throws org.apache.thrift.TException { - setTokenForSession_args args = new setTokenForSession_args(); + authenticated_args args = new authenticated_args(); args.setToken(token); - sendBase("setTokenForSession", args); + sendBase("authenticated", args); } - public void recv_setTokenForSession() throws org.apache.thrift.TException + public boolean recv_authenticated() throws org.apache.thrift.TException { - setTokenForSession_result result = new setTokenForSession_result(); - receiveBase(result, "setTokenForSession"); - return; + authenticated_result result = new authenticated_result(); + receiveBase(result, "authenticated"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "authenticated failed: unknown result"); + } + + public boolean setSessionInvalid(String token) throws org.apache.thrift.TException + { + send_setSessionInvalid(token); + return recv_setSessionInvalid(); + } + + public void send_setSessionInvalid(String token) throws org.apache.thrift.TException + { + setSessionInvalid_args args = new setSessionInvalid_args(); + args.setToken(token); + sendBase("setSessionInvalid", args); + } + + public boolean recv_setSessionInvalid() throws org.apache.thrift.TException + { + setSessionInvalid_result result = new setSessionInvalid_result(); + receiveBase(result, "setSessionInvalid"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "setSessionInvalid failed: unknown result"); } - public long DeleteFtpUser(String user) throws org.apache.thrift.TException + public long DeleteFtpUser(String user, String token) throws org.apache.thrift.TException { - send_DeleteFtpUser(user); + send_DeleteFtpUser(user, token); return recv_DeleteFtpUser(); } - public void send_DeleteFtpUser(String user) throws org.apache.thrift.TException + public void send_DeleteFtpUser(String user, String token) throws org.apache.thrift.TException { DeleteFtpUser_args args = new DeleteFtpUser_args(); args.setUser(user); + args.setToken(token); sendBase("DeleteFtpUser", args); } @@ -315,17 +351,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "DeleteFtpUser failed: unknown result"); } - public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException + public String getPathOfImage(String image_id, String version, String token) throws org.apache.thrift.TException { - send_getPathOfImage(image_id, version); + send_getPathOfImage(image_id, version, token); return recv_getPathOfImage(); } - public void send_getPathOfImage(String image_id, String version) throws org.apache.thrift.TException + public void send_getPathOfImage(String image_id, String version, String token) throws org.apache.thrift.TException { getPathOfImage_args args = new getPathOfImage_args(); args.setImage_id(image_id); args.setVersion(version); + args.setToken(token); sendBase("getPathOfImage", args); } @@ -339,16 +376,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - public String setInstitution(String university) throws org.apache.thrift.TException + public String setInstitution(String university, String token) throws org.apache.thrift.TException { - send_setInstitution(university); + send_setInstitution(university, token); return recv_setInstitution(); } - public void send_setInstitution(String university) throws org.apache.thrift.TException + public void send_setInstitution(String university, String token) throws org.apache.thrift.TException { setInstitution_args args = new setInstitution_args(); args.setUniversity(university); + args.setToken(token); sendBase("setInstitution", args); } @@ -362,22 +400,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "setInstitution failed: unknown result"); } - public boolean writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, String token, String userID) throws org.apache.thrift.TException { - send_writeVLdata(imagename, desc, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os, uid); + send_writeVLdata(imagename, desc, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os, uid, token, userID); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, String token, String userID) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); args.setDesc(desc); - args.setLogin(login); - args.setFirstname(firstname); - args.setLastname(lastname); - args.setUniversity(university); - args.setMail(Mail); args.setTel(Tel); args.setFak(Fak); args.setLicense(license); @@ -390,6 +423,8 @@ public class Server { args.setShareMode(shareMode); args.setOs(os); args.setUid(uid); + args.setToken(token); + args.setUserID(userID); sendBase("writeVLdata", args); } @@ -403,16 +438,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "writeVLdata failed: unknown result"); } - public List<Image> getImageListPermissionWrite(String userID) throws org.apache.thrift.TException + public List<Image> getImageListPermissionWrite(String userID, String token) throws org.apache.thrift.TException { - send_getImageListPermissionWrite(userID); + send_getImageListPermissionWrite(userID, token); return recv_getImageListPermissionWrite(); } - public void send_getImageListPermissionWrite(String userID) throws org.apache.thrift.TException + public void send_getImageListPermissionWrite(String userID, String token) throws org.apache.thrift.TException { getImageListPermissionWrite_args args = new getImageListPermissionWrite_args(); args.setUserID(userID); + args.setToken(token); sendBase("getImageListPermissionWrite", args); } @@ -426,16 +462,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageListPermissionWrite failed: unknown result"); } - public List<Image> getImageListPermissionRead(String userID) throws org.apache.thrift.TException + public List<Image> getImageListPermissionRead(String userID, String token) throws org.apache.thrift.TException { - send_getImageListPermissionRead(userID); + send_getImageListPermissionRead(userID, token); return recv_getImageListPermissionRead(); } - public void send_getImageListPermissionRead(String userID) throws org.apache.thrift.TException + public void send_getImageListPermissionRead(String userID, String token) throws org.apache.thrift.TException { getImageListPermissionRead_args args = new getImageListPermissionRead_args(); args.setUserID(userID); + args.setToken(token); sendBase("getImageListPermissionRead", args); } @@ -449,16 +486,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageListPermissionRead failed: unknown result"); } - public List<Image> getImageListPermissionLink(String userID) throws org.apache.thrift.TException + public List<Image> getImageListPermissionLink(String userID, String token) throws org.apache.thrift.TException { - send_getImageListPermissionLink(userID); + send_getImageListPermissionLink(userID, token); return recv_getImageListPermissionLink(); } - public void send_getImageListPermissionLink(String userID) throws org.apache.thrift.TException + public void send_getImageListPermissionLink(String userID, String token) throws org.apache.thrift.TException { getImageListPermissionLink_args args = new getImageListPermissionLink_args(); args.setUserID(userID); + args.setToken(token); sendBase("getImageListPermissionLink", args); } @@ -472,16 +510,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageListPermissionLink failed: unknown result"); } - public List<Image> getImageListPermissionAdmin(String userID) throws org.apache.thrift.TException + public List<Image> getImageListPermissionAdmin(String userID, String token) throws org.apache.thrift.TException { - send_getImageListPermissionAdmin(userID); + send_getImageListPermissionAdmin(userID, token); return recv_getImageListPermissionAdmin(); } - public void send_getImageListPermissionAdmin(String userID) throws org.apache.thrift.TException + public void send_getImageListPermissionAdmin(String userID, String token) throws org.apache.thrift.TException { getImageListPermissionAdmin_args args = new getImageListPermissionAdmin_args(); args.setUserID(userID); + args.setToken(token); sendBase("getImageListPermissionAdmin", args); } @@ -495,15 +534,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageListPermissionAdmin failed: unknown result"); } - public List<Image> getImageListAllTemplates() throws org.apache.thrift.TException + public List<Image> getImageListAllTemplates(String token) throws org.apache.thrift.TException { - send_getImageListAllTemplates(); + send_getImageListAllTemplates(token); return recv_getImageListAllTemplates(); } - public void send_getImageListAllTemplates() throws org.apache.thrift.TException + public void send_getImageListAllTemplates(String token) throws org.apache.thrift.TException { getImageListAllTemplates_args args = new getImageListAllTemplates_args(); + args.setToken(token); sendBase("getImageListAllTemplates", args); } @@ -517,16 +557,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageListAllTemplates failed: unknown result"); } - public List<Image> getImageList(String userID) throws org.apache.thrift.TException + public List<Image> getImageList(String token) throws org.apache.thrift.TException { - send_getImageList(userID); + send_getImageList(token); return recv_getImageList(); } - public void send_getImageList(String userID) throws org.apache.thrift.TException + public void send_getImageList(String token) throws org.apache.thrift.TException { getImageList_args args = new getImageList_args(); - args.setUserID(userID); + args.setToken(token); sendBase("getImageList", args); } @@ -540,15 +580,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageList failed: unknown result"); } - public List<Lecture> getLectureList() throws org.apache.thrift.TException + public List<Lecture> getLectureList(String token) throws org.apache.thrift.TException { - send_getLectureList(); + send_getLectureList(token); return recv_getLectureList(); } - public void send_getLectureList() throws org.apache.thrift.TException + public void send_getLectureList(String token) throws org.apache.thrift.TException { getLectureList_args args = new getLectureList_args(); + args.setToken(token); sendBase("getLectureList", args); } @@ -562,16 +603,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureList failed: unknown result"); } - public List<Lecture> getLectureListPermissionRead(String userID) throws org.apache.thrift.TException + public List<Lecture> getLectureListPermissionRead(String token) throws org.apache.thrift.TException { - send_getLectureListPermissionRead(userID); + send_getLectureListPermissionRead(token); return recv_getLectureListPermissionRead(); } - public void send_getLectureListPermissionRead(String userID) throws org.apache.thrift.TException + public void send_getLectureListPermissionRead(String token) throws org.apache.thrift.TException { getLectureListPermissionRead_args args = new getLectureListPermissionRead_args(); - args.setUserID(userID); + args.setToken(token); sendBase("getLectureListPermissionRead", args); } @@ -585,16 +626,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureListPermissionRead failed: unknown result"); } - public List<Lecture> getLectureListPermissionWrite(String userID) throws org.apache.thrift.TException + public List<Lecture> getLectureListPermissionWrite(String token) throws org.apache.thrift.TException { - send_getLectureListPermissionWrite(userID); + send_getLectureListPermissionWrite(token); return recv_getLectureListPermissionWrite(); } - public void send_getLectureListPermissionWrite(String userID) throws org.apache.thrift.TException + public void send_getLectureListPermissionWrite(String token) throws org.apache.thrift.TException { getLectureListPermissionWrite_args args = new getLectureListPermissionWrite_args(); - args.setUserID(userID); + args.setToken(token); sendBase("getLectureListPermissionWrite", args); } @@ -608,16 +649,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureListPermissionWrite failed: unknown result"); } - public List<Lecture> getLectureListPermissionAdmin(String userID) throws org.apache.thrift.TException + public List<Lecture> getLectureListPermissionAdmin(String token) throws org.apache.thrift.TException { - send_getLectureListPermissionAdmin(userID); + send_getLectureListPermissionAdmin(token); return recv_getLectureListPermissionAdmin(); } - public void send_getLectureListPermissionAdmin(String userID) throws org.apache.thrift.TException + public void send_getLectureListPermissionAdmin(String token) throws org.apache.thrift.TException { getLectureListPermissionAdmin_args args = new getLectureListPermissionAdmin_args(); - args.setUserID(userID); + args.setToken(token); sendBase("getLectureListPermissionAdmin", args); } @@ -631,15 +672,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureListPermissionAdmin failed: unknown result"); } - public List<String> getAllOS() throws org.apache.thrift.TException + public List<String> getAllOS(String token) throws org.apache.thrift.TException { - send_getAllOS(); + send_getAllOS(token); return recv_getAllOS(); } - public void send_getAllOS() throws org.apache.thrift.TException + public void send_getAllOS(String token) throws org.apache.thrift.TException { getAllOS_args args = new getAllOS_args(); + args.setToken(token); sendBase("getAllOS", args); } @@ -653,15 +695,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllOS failed: unknown result"); } - public List<String> getAllUniversities() throws org.apache.thrift.TException + public List<String> getAllUniversities(String token) throws org.apache.thrift.TException { - send_getAllUniversities(); + send_getAllUniversities(token); return recv_getAllUniversities(); } - public void send_getAllUniversities() throws org.apache.thrift.TException + public void send_getAllUniversities(String token) throws org.apache.thrift.TException { getAllUniversities_args args = new getAllUniversities_args(); + args.setToken(token); sendBase("getAllUniversities", args); } @@ -675,17 +718,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllUniversities failed: unknown result"); } - public Map<String,String> getPersonData(String Vorname, String Nachname) throws org.apache.thrift.TException + public Map<String,String> getPersonData(String Vorname, String Nachname, String token) throws org.apache.thrift.TException { - send_getPersonData(Vorname, Nachname); + send_getPersonData(Vorname, Nachname, token); return recv_getPersonData(); } - public void send_getPersonData(String Vorname, String Nachname) throws org.apache.thrift.TException + public void send_getPersonData(String Vorname, String Nachname, String token) throws org.apache.thrift.TException { getPersonData_args args = new getPersonData_args(); args.setVorname(Vorname); args.setNachname(Nachname); + args.setToken(token); sendBase("getPersonData", args); } @@ -699,16 +743,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPersonData failed: unknown result"); } - public Map<String,String> getItemOwner(String itemID) throws org.apache.thrift.TException + public Map<String,String> getItemOwner(String itemID, String token) throws org.apache.thrift.TException { - send_getItemOwner(itemID); + send_getItemOwner(itemID, token); return recv_getItemOwner(); } - public void send_getItemOwner(String itemID) throws org.apache.thrift.TException + public void send_getItemOwner(String itemID, String token) throws org.apache.thrift.TException { getItemOwner_args args = new getItemOwner_args(); args.setItemID(itemID); + args.setToken(token); sendBase("getItemOwner", args); } @@ -722,20 +767,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getItemOwner failed: unknown result"); } - public void setPerson(String login, String lastname, String firstname, String mail, String Institution) throws org.apache.thrift.TException + public void setPerson(String userID, String token, String institution) throws org.apache.thrift.TException { - send_setPerson(login, lastname, firstname, mail, Institution); + send_setPerson(userID, token, institution); recv_setPerson(); } - public void send_setPerson(String login, String lastname, String firstname, String mail, String Institution) throws org.apache.thrift.TException + public void send_setPerson(String userID, String token, String institution) throws org.apache.thrift.TException { setPerson_args args = new setPerson_args(); - args.setLogin(login); - args.setLastname(lastname); - args.setFirstname(firstname); - args.setMail(mail); - args.setInstitution(Institution); + args.setUserID(userID); + args.setToken(token); + args.setInstitution(institution); sendBase("setPerson", args); } @@ -746,13 +789,13 @@ public class Server { return; } - public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String lectureID) throws org.apache.thrift.TException + public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String token, String Tel, String Fak, String lectureID, String university) throws org.apache.thrift.TException { - send_writeLecturedata(name, shortdesc, desc, startDate, endDate, isActive, imagename, login, firstname, lastname, university, Mail, Tel, Fak, lectureID); + send_writeLecturedata(name, shortdesc, desc, startDate, endDate, isActive, imagename, token, Tel, Fak, lectureID, university); return recv_writeLecturedata(); } - public void send_writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String lectureID) throws org.apache.thrift.TException + public void send_writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String token, String Tel, String Fak, String lectureID, String university) throws org.apache.thrift.TException { writeLecturedata_args args = new writeLecturedata_args(); args.setName(name); @@ -762,14 +805,11 @@ public class Server { args.setEndDate(endDate); args.setIsActive(isActive); args.setImagename(imagename); - args.setLogin(login); - args.setFirstname(firstname); - args.setLastname(lastname); - args.setUniversity(university); - args.setMail(Mail); + args.setToken(token); args.setTel(Tel); args.setFak(Fak); args.setLectureID(lectureID); + args.setUniversity(university); sendBase("writeLecturedata", args); } @@ -783,16 +823,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "writeLecturedata failed: unknown result"); } - public boolean startFileCopy(String file) throws org.apache.thrift.TException + public boolean startFileCopy(String file, String token) throws org.apache.thrift.TException { - send_startFileCopy(file); + send_startFileCopy(file, token); return recv_startFileCopy(); } - public void send_startFileCopy(String file) throws org.apache.thrift.TException + public void send_startFileCopy(String file, String token) throws org.apache.thrift.TException { startFileCopy_args args = new startFileCopy_args(); args.setFile(file); + args.setToken(token); sendBase("startFileCopy", args); } @@ -806,17 +847,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startFileCopy failed: unknown result"); } - public Map<String,String> getImageData(String imageid, String imageversion) throws org.apache.thrift.TException + public Map<String,String> getImageData(String imageid, String imageversion, String token) throws org.apache.thrift.TException { - send_getImageData(imageid, imageversion); + send_getImageData(imageid, imageversion, token); return recv_getImageData(); } - public void send_getImageData(String imageid, String imageversion) throws org.apache.thrift.TException + public void send_getImageData(String imageid, String imageversion, String token) throws org.apache.thrift.TException { getImageData_args args = new getImageData_args(); args.setImageid(imageid); args.setImageversion(imageversion); + args.setToken(token); sendBase("getImageData", args); } @@ -830,16 +872,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public Map<String,String> getLectureData(String lectureid) throws org.apache.thrift.TException + public Map<String,String> getLectureData(String lectureid, String token) throws org.apache.thrift.TException { - send_getLectureData(lectureid); + send_getLectureData(lectureid, token); return recv_getLectureData(); } - public void send_getLectureData(String lectureid) throws org.apache.thrift.TException + public void send_getLectureData(String lectureid, String token) throws org.apache.thrift.TException { getLectureData_args args = new getLectureData_args(); args.setLectureid(lectureid); + args.setToken(token); sendBase("getLectureData", args); } @@ -853,13 +896,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result"); } - public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, String token) throws org.apache.thrift.TException { - send_updateImageData(name, newName, desc, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os); + send_updateImageData(name, newName, desc, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os, token); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, String token) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); @@ -876,6 +919,7 @@ public class Server { args.setFilesize(filesize); args.setShareMode(shareMode); args.setOs(os); + args.setToken(token); sendBase("updateImageData", args); } @@ -889,17 +933,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateImageData failed: unknown result"); } - public boolean deleteImageData(String id, String version) throws org.apache.thrift.TException + public boolean deleteImageData(String id, String version, String token) throws org.apache.thrift.TException { - send_deleteImageData(id, version); + send_deleteImageData(id, version, token); return recv_deleteImageData(); } - public void send_deleteImageData(String id, String version) throws org.apache.thrift.TException + public void send_deleteImageData(String id, String version, String token) throws org.apache.thrift.TException { deleteImageData_args args = new deleteImageData_args(); args.setId(id); args.setVersion(version); + args.setToken(token); sendBase("deleteImageData", args); } @@ -913,13 +958,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageData failed: unknown result"); } - public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String user, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String token, String Tel, String Fak, String id, String university) throws org.apache.thrift.TException { - send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imageid, imageversion, user, firstname, lastname, university, Mail, Tel, Fak, id); + send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imageid, imageversion, token, Tel, Fak, id, university); return recv_updateLecturedata(); } - public void send_updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String user, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException + public void send_updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String token, String Tel, String Fak, String id, String university) throws org.apache.thrift.TException { updateLecturedata_args args = new updateLecturedata_args(); args.setName(name); @@ -931,14 +976,11 @@ public class Server { args.setIsActive(isActive); args.setImageid(imageid); args.setImageversion(imageversion); - args.setUser(user); - args.setFirstname(firstname); - args.setLastname(lastname); - args.setUniversity(university); - args.setMail(Mail); + args.setToken(token); args.setTel(Tel); args.setFak(Fak); args.setId(id); + args.setUniversity(university); sendBase("updateLecturedata", args); } @@ -952,17 +994,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateLecturedata failed: unknown result"); } - public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException + public boolean deleteImageServer(String id, String version, String token) throws org.apache.thrift.TException { - send_deleteImageServer(id, version); + send_deleteImageServer(id, version, token); return recv_deleteImageServer(); } - public void send_deleteImageServer(String id, String version) throws org.apache.thrift.TException + public void send_deleteImageServer(String id, String version, String token) throws org.apache.thrift.TException { deleteImageServer_args args = new deleteImageServer_args(); args.setId(id); args.setVersion(version); + args.setToken(token); sendBase("deleteImageServer", args); } @@ -976,17 +1019,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageServer failed: unknown result"); } - public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException + public boolean connectedToLecture(String id, String version, String token) throws org.apache.thrift.TException { - send_connectedToLecture(id, version); + send_connectedToLecture(id, version, token); return recv_connectedToLecture(); } - public void send_connectedToLecture(String id, String version) throws org.apache.thrift.TException + public void send_connectedToLecture(String id, String version, String token) throws org.apache.thrift.TException { connectedToLecture_args args = new connectedToLecture_args(); args.setId(id); args.setVersion(version); + args.setToken(token); sendBase("connectedToLecture", args); } @@ -1000,18 +1044,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "connectedToLecture failed: unknown result"); } - public boolean deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException + public boolean deleteLecture(String id, String token, String university) throws org.apache.thrift.TException { - send_deleteLecture(id, hs, user); + send_deleteLecture(id, token, university); return recv_deleteLecture(); } - public void send_deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException + public void send_deleteLecture(String id, String token, String university) throws org.apache.thrift.TException { deleteLecture_args args = new deleteLecture_args(); args.setId(id); - args.setHs(hs); - args.setUser(user); + args.setToken(token); + args.setUniversity(university); sendBase("deleteLecture", args); } @@ -1025,16 +1069,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteLecture failed: unknown result"); } - public boolean checkUser(String username) throws org.apache.thrift.TException + public boolean checkUser(String username, String token) throws org.apache.thrift.TException { - send_checkUser(username); + send_checkUser(username, token); return recv_checkUser(); } - public void send_checkUser(String username) throws org.apache.thrift.TException + public void send_checkUser(String username, String token) throws org.apache.thrift.TException { checkUser_args args = new checkUser_args(); args.setUsername(username); + args.setToken(token); sendBase("checkUser", args); } @@ -1048,19 +1093,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkUser failed: unknown result"); } - public boolean createUser(String loginName, String lastName, String firstName, String mail, String university) throws org.apache.thrift.TException + public boolean createUser(String token, String university) throws org.apache.thrift.TException { - send_createUser(loginName, lastName, firstName, mail, university); + send_createUser(token, university); return recv_createUser(); } - public void send_createUser(String loginName, String lastName, String firstName, String mail, String university) throws org.apache.thrift.TException + public void send_createUser(String token, String university) throws org.apache.thrift.TException { createUser_args args = new createUser_args(); - args.setLoginName(loginName); - args.setLastName(lastName); - args.setFirstName(firstName); - args.setMail(mail); + args.setToken(token); args.setUniversity(university); sendBase("createUser", args); } @@ -1075,22 +1117,20 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createUser failed: unknown result"); } - public boolean writeImageRights(String imagename, String username, String lastName, String firstName, String mail, String university, String role) throws org.apache.thrift.TException + public boolean writeImageRights(String imagename, String token, String role, String university, String userID) throws org.apache.thrift.TException { - send_writeImageRights(imagename, username, lastName, firstName, mail, university, role); + send_writeImageRights(imagename, token, role, university, userID); return recv_writeImageRights(); } - public void send_writeImageRights(String imagename, String username, String lastName, String firstName, String mail, String university, String role) throws org.apache.thrift.TException + public void send_writeImageRights(String imagename, String token, String role, String university, String userID) throws org.apache.thrift.TException { writeImageRights_args args = new writeImageRights_args(); args.setImagename(imagename); - args.setUsername(username); - args.setLastName(lastName); - args.setFirstName(firstName); - args.setMail(mail); - args.setUniversity(university); + args.setToken(token); args.setRole(role); + args.setUniversity(university); + args.setUserID(userID); sendBase("writeImageRights", args); } @@ -1104,13 +1144,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "writeImageRights failed: unknown result"); } - public boolean writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin) throws org.apache.thrift.TException + public boolean writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, String token) throws org.apache.thrift.TException { - send_writeAdditionalImageRights(imageName, userID, isRead, isWrite, isLinkAllowed, isAdmin); + send_writeAdditionalImageRights(imageName, userID, isRead, isWrite, isLinkAllowed, isAdmin, token); return recv_writeAdditionalImageRights(); } - public void send_writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin) throws org.apache.thrift.TException + public void send_writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, String token) throws org.apache.thrift.TException { writeAdditionalImageRights_args args = new writeAdditionalImageRights_args(); args.setImageName(imageName); @@ -1119,6 +1159,7 @@ public class Server { args.setIsWrite(isWrite); args.setIsLinkAllowed(isLinkAllowed); args.setIsAdmin(isAdmin); + args.setToken(token); sendBase("writeAdditionalImageRights", args); } @@ -1132,22 +1173,20 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "writeAdditionalImageRights failed: unknown result"); } - public boolean writeLectureRights(String lecturename, String username, String lastName, String firstName, String mail, String university, String role) throws org.apache.thrift.TException + public boolean writeLectureRights(String lectureID, String role, String token, String university, String userID) throws org.apache.thrift.TException { - send_writeLectureRights(lecturename, username, lastName, firstName, mail, university, role); + send_writeLectureRights(lectureID, role, token, university, userID); return recv_writeLectureRights(); } - public void send_writeLectureRights(String lecturename, String username, String lastName, String firstName, String mail, String university, String role) throws org.apache.thrift.TException + public void send_writeLectureRights(String lectureID, String role, String token, String university, String userID) throws org.apache.thrift.TException { writeLectureRights_args args = new writeLectureRights_args(); - args.setLecturename(lecturename); - args.setUsername(username); - args.setLastName(lastName); - args.setFirstName(firstName); - args.setMail(mail); - args.setUniversity(university); + args.setLectureID(lectureID); args.setRole(role); + args.setToken(token); + args.setUniversity(university); + args.setUserID(userID); sendBase("writeLectureRights", args); } @@ -1161,13 +1200,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "writeLectureRights failed: unknown result"); } - public boolean writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin) throws org.apache.thrift.TException + public boolean writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token) throws org.apache.thrift.TException { - send_writeAdditionalLectureRights(lectureName, userID, isRead, isWrite, isAdmin); + send_writeAdditionalLectureRights(lectureName, userID, isRead, isWrite, isAdmin, token); return recv_writeAdditionalLectureRights(); } - public void send_writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin) throws org.apache.thrift.TException + public void send_writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token) throws org.apache.thrift.TException { writeAdditionalLectureRights_args args = new writeAdditionalLectureRights_args(); args.setLectureName(lectureName); @@ -1175,6 +1214,7 @@ public class Server { args.setIsRead(isRead); args.setIsWrite(isWrite); args.setIsAdmin(isAdmin); + args.setToken(token); sendBase("writeAdditionalLectureRights", args); } @@ -1188,16 +1228,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "writeAdditionalLectureRights failed: unknown result"); } - public List<Person> getAllOtherSatelliteUsers(List<String> userID) throws org.apache.thrift.TException + public List<Person> getAllOtherSatelliteUsers(List<String> userID, String token) throws org.apache.thrift.TException { - send_getAllOtherSatelliteUsers(userID); + send_getAllOtherSatelliteUsers(userID, token); return recv_getAllOtherSatelliteUsers(); } - public void send_getAllOtherSatelliteUsers(List<String> userID) throws org.apache.thrift.TException + public void send_getAllOtherSatelliteUsers(List<String> userID, String token) throws org.apache.thrift.TException { getAllOtherSatelliteUsers_args args = new getAllOtherSatelliteUsers_args(); args.setUserID(userID); + args.setToken(token); sendBase("getAllOtherSatelliteUsers", args); } @@ -1211,17 +1252,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllOtherSatelliteUsers failed: unknown result"); } - public List<Person> getPermissionForUserAndImage(String userID, String imageID) throws org.apache.thrift.TException + public List<Person> getPermissionForUserAndImage(String token, String imageID, String userID) throws org.apache.thrift.TException { - send_getPermissionForUserAndImage(userID, imageID); + send_getPermissionForUserAndImage(token, imageID, userID); return recv_getPermissionForUserAndImage(); } - public void send_getPermissionForUserAndImage(String userID, String imageID) throws org.apache.thrift.TException + public void send_getPermissionForUserAndImage(String token, String imageID, String userID) throws org.apache.thrift.TException { getPermissionForUserAndImage_args args = new getPermissionForUserAndImage_args(); - args.setUserID(userID); + args.setToken(token); args.setImageID(imageID); + args.setUserID(userID); sendBase("getPermissionForUserAndImage", args); } @@ -1235,16 +1277,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPermissionForUserAndImage failed: unknown result"); } - public List<String> getAdditionalImageContacts(String imageID) throws org.apache.thrift.TException + public List<String> getAdditionalImageContacts(String imageID, String token) throws org.apache.thrift.TException { - send_getAdditionalImageContacts(imageID); + send_getAdditionalImageContacts(imageID, token); return recv_getAdditionalImageContacts(); } - public void send_getAdditionalImageContacts(String imageID) throws org.apache.thrift.TException + public void send_getAdditionalImageContacts(String imageID, String token) throws org.apache.thrift.TException { getAdditionalImageContacts_args args = new getAdditionalImageContacts_args(); args.setImageID(imageID); + args.setToken(token); sendBase("getAdditionalImageContacts", args); } @@ -1258,17 +1301,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAdditionalImageContacts failed: unknown result"); } - public List<Person> getPermissionForUserAndLecture(String userID, String lectureID) throws org.apache.thrift.TException + public List<Person> getPermissionForUserAndLecture(String token, String lectureID, String userID) throws org.apache.thrift.TException { - send_getPermissionForUserAndLecture(userID, lectureID); + send_getPermissionForUserAndLecture(token, lectureID, userID); return recv_getPermissionForUserAndLecture(); } - public void send_getPermissionForUserAndLecture(String userID, String lectureID) throws org.apache.thrift.TException + public void send_getPermissionForUserAndLecture(String token, String lectureID, String userID) throws org.apache.thrift.TException { getPermissionForUserAndLecture_args args = new getPermissionForUserAndLecture_args(); - args.setUserID(userID); + args.setToken(token); args.setLectureID(lectureID); + args.setUserID(userID); sendBase("getPermissionForUserAndLecture", args); } @@ -1282,16 +1326,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPermissionForUserAndLecture failed: unknown result"); } - public void deleteAllAdditionalImagePermissions(String imageID, String userID) throws org.apache.thrift.TException + public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID) throws org.apache.thrift.TException { - send_deleteAllAdditionalImagePermissions(imageID, userID); + send_deleteAllAdditionalImagePermissions(imageID, token, userID); recv_deleteAllAdditionalImagePermissions(); } - public void send_deleteAllAdditionalImagePermissions(String imageID, String userID) throws org.apache.thrift.TException + public void send_deleteAllAdditionalImagePermissions(String imageID, String token, String userID) throws org.apache.thrift.TException { deleteAllAdditionalImagePermissions_args args = new deleteAllAdditionalImagePermissions_args(); args.setImageID(imageID); + args.setToken(token); args.setUserID(userID); sendBase("deleteAllAdditionalImagePermissions", args); } @@ -1303,16 +1348,17 @@ public class Server { return; } - public void deleteAllAdditionalLecturePermissions(String lectureID, String userID) throws org.apache.thrift.TException + public void deleteAllAdditionalLecturePermissions(String lectureID, String token, String userID) throws org.apache.thrift.TException { - send_deleteAllAdditionalLecturePermissions(lectureID, userID); + send_deleteAllAdditionalLecturePermissions(lectureID, token, userID); recv_deleteAllAdditionalLecturePermissions(); } - public void send_deleteAllAdditionalLecturePermissions(String lectureID, String userID) throws org.apache.thrift.TException + public void send_deleteAllAdditionalLecturePermissions(String lectureID, String token, String userID) throws org.apache.thrift.TException { deleteAllAdditionalLecturePermissions_args args = new deleteAllAdditionalLecturePermissions_args(); args.setLectureID(lectureID); + args.setToken(token); args.setUserID(userID); sendBase("deleteAllAdditionalLecturePermissions", args); } @@ -1324,16 +1370,17 @@ public class Server { return; } - public String getOsNameForGuestOs(String guestOS) throws org.apache.thrift.TException + public String getOsNameForGuestOs(String guestOS, String token) throws org.apache.thrift.TException { - send_getOsNameForGuestOs(guestOS); + send_getOsNameForGuestOs(guestOS, token); return recv_getOsNameForGuestOs(); } - public void send_getOsNameForGuestOs(String guestOS) throws org.apache.thrift.TException + public void send_getOsNameForGuestOs(String guestOS, String token) throws org.apache.thrift.TException { getOsNameForGuestOs_args args = new getOsNameForGuestOs_args(); args.setGuestOS(guestOS); + args.setToken(token); sendBase("getOsNameForGuestOs", args); } @@ -1347,17 +1394,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOsNameForGuestOs failed: unknown result"); } - public boolean userIsImageAdmin(String userID, String imageID) throws org.apache.thrift.TException + public boolean userIsImageAdmin(String imageID, String token, String userID) throws org.apache.thrift.TException { - send_userIsImageAdmin(userID, imageID); + send_userIsImageAdmin(imageID, token, userID); return recv_userIsImageAdmin(); } - public void send_userIsImageAdmin(String userID, String imageID) throws org.apache.thrift.TException + public void send_userIsImageAdmin(String imageID, String token, String userID) throws org.apache.thrift.TException { userIsImageAdmin_args args = new userIsImageAdmin_args(); - args.setUserID(userID); args.setImageID(imageID); + args.setToken(token); + args.setUserID(userID); sendBase("userIsImageAdmin", args); } @@ -1371,17 +1419,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "userIsImageAdmin failed: unknown result"); } - public boolean userIsLectureAdmin(String userID, String lectureID) throws org.apache.thrift.TException + public boolean userIsLectureAdmin(String userID, String lectureID, String token) throws org.apache.thrift.TException { - send_userIsLectureAdmin(userID, lectureID); + send_userIsLectureAdmin(userID, lectureID, token); return recv_userIsLectureAdmin(); } - public void send_userIsLectureAdmin(String userID, String lectureID) throws org.apache.thrift.TException + public void send_userIsLectureAdmin(String userID, String lectureID, String token) throws org.apache.thrift.TException { userIsLectureAdmin_args args = new userIsLectureAdmin_args(); args.setUserID(userID); args.setLectureID(lectureID); + args.setToken(token); sendBase("userIsLectureAdmin", args); } @@ -1395,15 +1444,16 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "userIsLectureAdmin failed: unknown result"); } - public String createRandomUUID() throws org.apache.thrift.TException + public String createRandomUUID(String token) throws org.apache.thrift.TException { - send_createRandomUUID(); + send_createRandomUUID(token); return recv_createRandomUUID(); } - public void send_createRandomUUID() throws org.apache.thrift.TException + public void send_createRandomUUID(String token) throws org.apache.thrift.TException { createRandomUUID_args args = new createRandomUUID_args(); + args.setToken(token); sendBase("createRandomUUID", args); } @@ -1417,6 +1467,29 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createRandomUUID failed: unknown result"); } + public String getInstitutionByID(String institutionID) throws org.apache.thrift.TException + { + send_getInstitutionByID(institutionID); + return recv_getInstitutionByID(); + } + + public void send_getInstitutionByID(String institutionID) throws org.apache.thrift.TException + { + getInstitutionByID_args args = new getInstitutionByID_args(); + args.setInstitutionID(institutionID); + sendBase("getInstitutionByID", args); + } + + public String recv_getInstitutionByID() throws org.apache.thrift.TException + { + getInstitutionByID_result result = new getInstitutionByID_result(); + receiveBase(result, "getInstitutionByID"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getInstitutionByID failed: unknown result"); + } + } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> { @@ -1435,21 +1508,24 @@ public class Server { super(protocolFactory, clientManager, transport); } - public void getFtpUser(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getFtpUser(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getFtpUser_call method_call = new getFtpUser_call(resultHandler, this, ___protocolFactory, ___transport); + getFtpUser_call method_call = new getFtpUser_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getFtpUser_call extends org.apache.thrift.async.TAsyncMethodCall { - public getFtpUser_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getFtpUser_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getFtpUser", org.apache.thrift.protocol.TMessageType.CALL, 0)); getFtpUser_args args = new getFtpUser_args(); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1464,56 +1540,91 @@ public class Server { } } - public void setTokenForSession(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void authenticated(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - setTokenForSession_call method_call = new setTokenForSession_call(token, resultHandler, this, ___protocolFactory, ___transport); + authenticated_call method_call = new authenticated_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class setTokenForSession_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class authenticated_call extends org.apache.thrift.async.TAsyncMethodCall { private String token; - public setTokenForSession_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public authenticated_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setTokenForSession", org.apache.thrift.protocol.TMessageType.CALL, 0)); - setTokenForSession_args args = new setTokenForSession_args(); + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("authenticated", org.apache.thrift.protocol.TMessageType.CALL, 0)); + authenticated_args args = new authenticated_args(); args.setToken(token); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift.TException { + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_authenticated(); + } + } + + public void setSessionInvalid(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + setSessionInvalid_call method_call = new setSessionInvalid_call(token, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class setSessionInvalid_call extends org.apache.thrift.async.TAsyncMethodCall { + private String token; + public setSessionInvalid_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.token = token; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setSessionInvalid", org.apache.thrift.protocol.TMessageType.CALL, 0)); + setSessionInvalid_args args = new setSessionInvalid_args(); + args.setToken(token); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); - (new Client(prot)).recv_setTokenForSession(); + return (new Client(prot)).recv_setSessionInvalid(); } } - public void DeleteFtpUser(String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void DeleteFtpUser(String user, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - DeleteFtpUser_call method_call = new DeleteFtpUser_call(user, resultHandler, this, ___protocolFactory, ___transport); + DeleteFtpUser_call method_call = new DeleteFtpUser_call(user, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class DeleteFtpUser_call extends org.apache.thrift.async.TAsyncMethodCall { private String user; - public DeleteFtpUser_call(String user, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public DeleteFtpUser_call(String user, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.user = user; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("DeleteFtpUser", org.apache.thrift.protocol.TMessageType.CALL, 0)); DeleteFtpUser_args args = new DeleteFtpUser_args(); args.setUser(user); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1528,9 +1639,9 @@ public class Server { } } - public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPathOfImage(String image_id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPathOfImage_call method_call = new getPathOfImage_call(image_id, version, resultHandler, this, ___protocolFactory, ___transport); + getPathOfImage_call method_call = new getPathOfImage_call(image_id, version, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1538,10 +1649,12 @@ public class Server { public static class getPathOfImage_call extends org.apache.thrift.async.TAsyncMethodCall { private String image_id; private String version; - public getPathOfImage_call(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getPathOfImage_call(String image_id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.image_id = image_id; this.version = version; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -1549,6 +1662,7 @@ public class Server { getPathOfImage_args args = new getPathOfImage_args(); args.setImage_id(image_id); args.setVersion(version); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1563,24 +1677,27 @@ public class Server { } } - public void setInstitution(String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void setInstitution(String university, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - setInstitution_call method_call = new setInstitution_call(university, resultHandler, this, ___protocolFactory, ___transport); + setInstitution_call method_call = new setInstitution_call(university, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class setInstitution_call extends org.apache.thrift.async.TAsyncMethodCall { private String university; - public setInstitution_call(String university, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public setInstitution_call(String university, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.university = university; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setInstitution", org.apache.thrift.protocol.TMessageType.CALL, 0)); setInstitution_args args = new setInstitution_args(); args.setUniversity(university); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1595,9 +1712,9 @@ public class Server { } } - public void writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, desc, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os, uid, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, desc, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os, uid, token, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1605,11 +1722,6 @@ public class Server { public static class writeVLdata_call extends org.apache.thrift.async.TAsyncMethodCall { private String imagename; private String desc; - private String login; - private String firstname; - private String lastname; - private String university; - private String Mail; private String Tel; private String Fak; private boolean license; @@ -1622,15 +1734,12 @@ public class Server { private long shareMode; private String os; private String uid; - public writeVLdata_call(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + private String userID; + public writeVLdata_call(String imagename, String desc, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, String uid, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; this.desc = desc; - this.login = login; - this.firstname = firstname; - this.lastname = lastname; - this.university = university; - this.Mail = Mail; this.Tel = Tel; this.Fak = Fak; this.license = license; @@ -1643,6 +1752,8 @@ public class Server { this.shareMode = shareMode; this.os = os; this.uid = uid; + this.token = token; + this.userID = userID; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -1650,11 +1761,6 @@ public class Server { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); args.setDesc(desc); - args.setLogin(login); - args.setFirstname(firstname); - args.setLastname(lastname); - args.setUniversity(university); - args.setMail(Mail); args.setTel(Tel); args.setFak(Fak); args.setLicense(license); @@ -1667,6 +1773,8 @@ public class Server { args.setShareMode(shareMode); args.setOs(os); args.setUid(uid); + args.setToken(token); + args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); } @@ -1681,24 +1789,27 @@ public class Server { } } - public void getImageListPermissionWrite(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageListPermissionWrite(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageListPermissionWrite_call method_call = new getImageListPermissionWrite_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getImageListPermissionWrite_call method_call = new getImageListPermissionWrite_call(userID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getImageListPermissionWrite_call extends org.apache.thrift.async.TAsyncMethodCall { private String userID; - public getImageListPermissionWrite_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageListPermissionWrite_call(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageListPermissionWrite", org.apache.thrift.protocol.TMessageType.CALL, 0)); getImageListPermissionWrite_args args = new getImageListPermissionWrite_args(); args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1713,24 +1824,27 @@ public class Server { } } - public void getImageListPermissionRead(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageListPermissionRead(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageListPermissionRead_call method_call = new getImageListPermissionRead_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getImageListPermissionRead_call method_call = new getImageListPermissionRead_call(userID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getImageListPermissionRead_call extends org.apache.thrift.async.TAsyncMethodCall { private String userID; - public getImageListPermissionRead_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageListPermissionRead_call(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageListPermissionRead", org.apache.thrift.protocol.TMessageType.CALL, 0)); getImageListPermissionRead_args args = new getImageListPermissionRead_args(); args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1745,24 +1859,27 @@ public class Server { } } - public void getImageListPermissionLink(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageListPermissionLink(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageListPermissionLink_call method_call = new getImageListPermissionLink_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getImageListPermissionLink_call method_call = new getImageListPermissionLink_call(userID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getImageListPermissionLink_call extends org.apache.thrift.async.TAsyncMethodCall { private String userID; - public getImageListPermissionLink_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageListPermissionLink_call(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageListPermissionLink", org.apache.thrift.protocol.TMessageType.CALL, 0)); getImageListPermissionLink_args args = new getImageListPermissionLink_args(); args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1777,24 +1894,27 @@ public class Server { } } - public void getImageListPermissionAdmin(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageListPermissionAdmin(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageListPermissionAdmin_call method_call = new getImageListPermissionAdmin_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getImageListPermissionAdmin_call method_call = new getImageListPermissionAdmin_call(userID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getImageListPermissionAdmin_call extends org.apache.thrift.async.TAsyncMethodCall { private String userID; - public getImageListPermissionAdmin_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageListPermissionAdmin_call(String userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageListPermissionAdmin", org.apache.thrift.protocol.TMessageType.CALL, 0)); getImageListPermissionAdmin_args args = new getImageListPermissionAdmin_args(); args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1809,21 +1929,24 @@ public class Server { } } - public void getImageListAllTemplates(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageListAllTemplates(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageListAllTemplates_call method_call = new getImageListAllTemplates_call(resultHandler, this, ___protocolFactory, ___transport); + getImageListAllTemplates_call method_call = new getImageListAllTemplates_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getImageListAllTemplates_call extends org.apache.thrift.async.TAsyncMethodCall { - public getImageListAllTemplates_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageListAllTemplates_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageListAllTemplates", org.apache.thrift.protocol.TMessageType.CALL, 0)); getImageListAllTemplates_args args = new getImageListAllTemplates_args(); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1838,24 +1961,24 @@ public class Server { } } - public void getImageList(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageList(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageList_call method_call = new getImageList_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getImageList_call method_call = new getImageList_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getImageList_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; - public getImageList_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageList_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageList", org.apache.thrift.protocol.TMessageType.CALL, 0)); getImageList_args args = new getImageList_args(); - args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1870,21 +1993,24 @@ public class Server { } } - public void getLectureList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getLectureList(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getLectureList_call method_call = new getLectureList_call(resultHandler, this, ___protocolFactory, ___transport); + getLectureList_call method_call = new getLectureList_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getLectureList_call extends org.apache.thrift.async.TAsyncMethodCall { - public getLectureList_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getLectureList_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLectureList", org.apache.thrift.protocol.TMessageType.CALL, 0)); getLectureList_args args = new getLectureList_args(); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1899,24 +2025,24 @@ public class Server { } } - public void getLectureListPermissionRead(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getLectureListPermissionRead(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getLectureListPermissionRead_call method_call = new getLectureListPermissionRead_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getLectureListPermissionRead_call method_call = new getLectureListPermissionRead_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getLectureListPermissionRead_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; - public getLectureListPermissionRead_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getLectureListPermissionRead_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLectureListPermissionRead", org.apache.thrift.protocol.TMessageType.CALL, 0)); getLectureListPermissionRead_args args = new getLectureListPermissionRead_args(); - args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1931,24 +2057,24 @@ public class Server { } } - public void getLectureListPermissionWrite(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getLectureListPermissionWrite(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getLectureListPermissionWrite_call method_call = new getLectureListPermissionWrite_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getLectureListPermissionWrite_call method_call = new getLectureListPermissionWrite_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getLectureListPermissionWrite_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; - public getLectureListPermissionWrite_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getLectureListPermissionWrite_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLectureListPermissionWrite", org.apache.thrift.protocol.TMessageType.CALL, 0)); getLectureListPermissionWrite_args args = new getLectureListPermissionWrite_args(); - args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1963,24 +2089,24 @@ public class Server { } } - public void getLectureListPermissionAdmin(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getLectureListPermissionAdmin(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getLectureListPermissionAdmin_call method_call = new getLectureListPermissionAdmin_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getLectureListPermissionAdmin_call method_call = new getLectureListPermissionAdmin_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getLectureListPermissionAdmin_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; - public getLectureListPermissionAdmin_call(String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getLectureListPermissionAdmin_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLectureListPermissionAdmin", org.apache.thrift.protocol.TMessageType.CALL, 0)); getLectureListPermissionAdmin_args args = new getLectureListPermissionAdmin_args(); - args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -1995,21 +2121,24 @@ public class Server { } } - public void getAllOS(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getAllOS(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getAllOS_call method_call = new getAllOS_call(resultHandler, this, ___protocolFactory, ___transport); + getAllOS_call method_call = new getAllOS_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getAllOS_call extends org.apache.thrift.async.TAsyncMethodCall { - public getAllOS_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getAllOS_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllOS", org.apache.thrift.protocol.TMessageType.CALL, 0)); getAllOS_args args = new getAllOS_args(); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2024,21 +2153,24 @@ public class Server { } } - public void getAllUniversities(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getAllUniversities(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getAllUniversities_call method_call = new getAllUniversities_call(resultHandler, this, ___protocolFactory, ___transport); + getAllUniversities_call method_call = new getAllUniversities_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getAllUniversities_call extends org.apache.thrift.async.TAsyncMethodCall { - public getAllUniversities_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getAllUniversities_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllUniversities", org.apache.thrift.protocol.TMessageType.CALL, 0)); getAllUniversities_args args = new getAllUniversities_args(); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2053,9 +2185,9 @@ public class Server { } } - public void getPersonData(String Vorname, String Nachname, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPersonData(String Vorname, String Nachname, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPersonData_call method_call = new getPersonData_call(Vorname, Nachname, resultHandler, this, ___protocolFactory, ___transport); + getPersonData_call method_call = new getPersonData_call(Vorname, Nachname, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2063,10 +2195,12 @@ public class Server { public static class getPersonData_call extends org.apache.thrift.async.TAsyncMethodCall { private String Vorname; private String Nachname; - public getPersonData_call(String Vorname, String Nachname, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getPersonData_call(String Vorname, String Nachname, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.Vorname = Vorname; this.Nachname = Nachname; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2074,6 +2208,7 @@ public class Server { getPersonData_args args = new getPersonData_args(); args.setVorname(Vorname); args.setNachname(Nachname); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2088,24 +2223,27 @@ public class Server { } } - public void getItemOwner(String itemID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getItemOwner(String itemID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getItemOwner_call method_call = new getItemOwner_call(itemID, resultHandler, this, ___protocolFactory, ___transport); + getItemOwner_call method_call = new getItemOwner_call(itemID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getItemOwner_call extends org.apache.thrift.async.TAsyncMethodCall { private String itemID; - public getItemOwner_call(String itemID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getItemOwner_call(String itemID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.itemID = itemID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getItemOwner", org.apache.thrift.protocol.TMessageType.CALL, 0)); getItemOwner_args args = new getItemOwner_args(); args.setItemID(itemID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2120,36 +2258,30 @@ public class Server { } } - public void setPerson(String login, String lastname, String firstname, String mail, String Institution, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void setPerson(String userID, String token, String institution, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - setPerson_call method_call = new setPerson_call(login, lastname, firstname, mail, Institution, resultHandler, this, ___protocolFactory, ___transport); + setPerson_call method_call = new setPerson_call(userID, token, institution, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class setPerson_call extends org.apache.thrift.async.TAsyncMethodCall { - private String login; - private String lastname; - private String firstname; - private String mail; - private String Institution; - public setPerson_call(String login, String lastname, String firstname, String mail, String Institution, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String userID; + private String token; + private String institution; + public setPerson_call(String userID, String token, String institution, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.login = login; - this.lastname = lastname; - this.firstname = firstname; - this.mail = mail; - this.Institution = Institution; + this.userID = userID; + this.token = token; + this.institution = institution; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("setPerson", org.apache.thrift.protocol.TMessageType.CALL, 0)); setPerson_args args = new setPerson_args(); - args.setLogin(login); - args.setLastname(lastname); - args.setFirstname(firstname); - args.setMail(mail); - args.setInstitution(Institution); + args.setUserID(userID); + args.setToken(token); + args.setInstitution(institution); args.write(prot); prot.writeMessageEnd(); } @@ -2164,9 +2296,9 @@ public class Server { } } - public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String token, String Tel, String Fak, String lectureID, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeLecturedata_call method_call = new writeLecturedata_call(name, shortdesc, desc, startDate, endDate, isActive, imagename, login, firstname, lastname, university, Mail, Tel, Fak, lectureID, resultHandler, this, ___protocolFactory, ___transport); + writeLecturedata_call method_call = new writeLecturedata_call(name, shortdesc, desc, startDate, endDate, isActive, imagename, token, Tel, Fak, lectureID, university, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2179,15 +2311,12 @@ public class Server { private String endDate; private boolean isActive; private String imagename; - private String login; - private String firstname; - private String lastname; - private String university; - private String Mail; + private String token; private String Tel; private String Fak; private String lectureID; - public writeLecturedata_call(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String university; + public writeLecturedata_call(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String token, String Tel, String Fak, String lectureID, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.shortdesc = shortdesc; @@ -2196,14 +2325,11 @@ public class Server { this.endDate = endDate; this.isActive = isActive; this.imagename = imagename; - this.login = login; - this.firstname = firstname; - this.lastname = lastname; - this.university = university; - this.Mail = Mail; + this.token = token; this.Tel = Tel; this.Fak = Fak; this.lectureID = lectureID; + this.university = university; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2216,14 +2342,11 @@ public class Server { args.setEndDate(endDate); args.setIsActive(isActive); args.setImagename(imagename); - args.setLogin(login); - args.setFirstname(firstname); - args.setLastname(lastname); - args.setUniversity(university); - args.setMail(Mail); + args.setToken(token); args.setTel(Tel); args.setFak(Fak); args.setLectureID(lectureID); + args.setUniversity(university); args.write(prot); prot.writeMessageEnd(); } @@ -2238,24 +2361,27 @@ public class Server { } } - public void startFileCopy(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void startFileCopy(String file, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - startFileCopy_call method_call = new startFileCopy_call(file, resultHandler, this, ___protocolFactory, ___transport); + startFileCopy_call method_call = new startFileCopy_call(file, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class startFileCopy_call extends org.apache.thrift.async.TAsyncMethodCall { private String file; - public startFileCopy_call(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public startFileCopy_call(String file, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.file = file; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("startFileCopy", org.apache.thrift.protocol.TMessageType.CALL, 0)); startFileCopy_args args = new startFileCopy_args(); args.setFile(file); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2270,9 +2396,9 @@ public class Server { } } - public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageData(String imageid, String imageversion, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getImageData_call method_call = new getImageData_call(imageid, imageversion, resultHandler, this, ___protocolFactory, ___transport); + getImageData_call method_call = new getImageData_call(imageid, imageversion, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2280,10 +2406,12 @@ public class Server { public static class getImageData_call extends org.apache.thrift.async.TAsyncMethodCall { private String imageid; private String imageversion; - public getImageData_call(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getImageData_call(String imageid, String imageversion, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imageid = imageid; this.imageversion = imageversion; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2291,6 +2419,7 @@ public class Server { getImageData_args args = new getImageData_args(); args.setImageid(imageid); args.setImageversion(imageversion); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2305,24 +2434,27 @@ public class Server { } } - public void getLectureData(String lectureid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getLectureData(String lectureid, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getLectureData_call method_call = new getLectureData_call(lectureid, resultHandler, this, ___protocolFactory, ___transport); + getLectureData_call method_call = new getLectureData_call(lectureid, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getLectureData_call extends org.apache.thrift.async.TAsyncMethodCall { private String lectureid; - public getLectureData_call(String lectureid, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getLectureData_call(String lectureid, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.lectureid = lectureid; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLectureData", org.apache.thrift.protocol.TMessageType.CALL, 0)); getLectureData_args args = new getLectureData_args(); args.setLectureid(lectureid); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2337,9 +2469,9 @@ public class Server { } } - public void updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, desc, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, desc, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2359,7 +2491,8 @@ public class Server { private long filesize; private long shareMode; private String os; - public updateImageData_call(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public updateImageData_call(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; @@ -2375,6 +2508,7 @@ public class Server { this.filesize = filesize; this.shareMode = shareMode; this.os = os; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2394,6 +2528,7 @@ public class Server { args.setFilesize(filesize); args.setShareMode(shareMode); args.setOs(os); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2408,9 +2543,9 @@ public class Server { } } - public void deleteImageData(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteImageData(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteImageData_call method_call = new deleteImageData_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + deleteImageData_call method_call = new deleteImageData_call(id, version, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2418,10 +2553,12 @@ public class Server { public static class deleteImageData_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; private String version; - public deleteImageData_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public deleteImageData_call(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; this.version = version; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2429,6 +2566,7 @@ public class Server { deleteImageData_args args = new deleteImageData_args(); args.setId(id); args.setVersion(version); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2443,9 +2581,9 @@ public class Server { } } - public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String user, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String token, String Tel, String Fak, String id, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateLecturedata_call method_call = new updateLecturedata_call(name, newName, shortdesc, desc, startDate, endDate, isActive, imageid, imageversion, user, firstname, lastname, university, Mail, Tel, Fak, id, resultHandler, this, ___protocolFactory, ___transport); + updateLecturedata_call method_call = new updateLecturedata_call(name, newName, shortdesc, desc, startDate, endDate, isActive, imageid, imageversion, token, Tel, Fak, id, university, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2460,15 +2598,12 @@ public class Server { private boolean isActive; private String imageid; private String imageversion; - private String user; - private String firstname; - private String lastname; - private String university; - private String Mail; + private String token; private String Tel; private String Fak; private String id; - public updateLecturedata_call(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String user, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String university; + public updateLecturedata_call(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String token, String Tel, String Fak, String id, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; @@ -2479,14 +2614,11 @@ public class Server { this.isActive = isActive; this.imageid = imageid; this.imageversion = imageversion; - this.user = user; - this.firstname = firstname; - this.lastname = lastname; - this.university = university; - this.Mail = Mail; + this.token = token; this.Tel = Tel; this.Fak = Fak; this.id = id; + this.university = university; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2501,14 +2633,11 @@ public class Server { args.setIsActive(isActive); args.setImageid(imageid); args.setImageversion(imageversion); - args.setUser(user); - args.setFirstname(firstname); - args.setLastname(lastname); - args.setUniversity(university); - args.setMail(Mail); + args.setToken(token); args.setTel(Tel); args.setFak(Fak); args.setId(id); + args.setUniversity(university); args.write(prot); prot.writeMessageEnd(); } @@ -2523,9 +2652,9 @@ public class Server { } } - public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteImageServer(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteImageServer_call method_call = new deleteImageServer_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + deleteImageServer_call method_call = new deleteImageServer_call(id, version, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2533,10 +2662,12 @@ public class Server { public static class deleteImageServer_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; private String version; - public deleteImageServer_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public deleteImageServer_call(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; this.version = version; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2544,6 +2675,7 @@ public class Server { deleteImageServer_args args = new deleteImageServer_args(); args.setId(id); args.setVersion(version); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2558,9 +2690,9 @@ public class Server { } } - public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void connectedToLecture(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - connectedToLecture_call method_call = new connectedToLecture_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + connectedToLecture_call method_call = new connectedToLecture_call(id, version, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2568,10 +2700,12 @@ public class Server { public static class connectedToLecture_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; private String version; - public connectedToLecture_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public connectedToLecture_call(String id, String version, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; this.version = version; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2579,6 +2713,7 @@ public class Server { connectedToLecture_args args = new connectedToLecture_args(); args.setId(id); args.setVersion(version); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2593,30 +2728,30 @@ public class Server { } } - public void deleteLecture(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteLecture(String id, String token, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteLecture_call method_call = new deleteLecture_call(id, hs, user, resultHandler, this, ___protocolFactory, ___transport); + deleteLecture_call method_call = new deleteLecture_call(id, token, university, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteLecture_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - private String hs; - private String user; - public deleteLecture_call(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + private String university; + public deleteLecture_call(String id, String token, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; - this.hs = hs; - this.user = user; + this.token = token; + this.university = university; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteLecture_args args = new deleteLecture_args(); args.setId(id); - args.setHs(hs); - args.setUser(user); + args.setToken(token); + args.setUniversity(university); args.write(prot); prot.writeMessageEnd(); } @@ -2631,24 +2766,27 @@ public class Server { } } - public void checkUser(String username, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void checkUser(String username, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - checkUser_call method_call = new checkUser_call(username, resultHandler, this, ___protocolFactory, ___transport); + checkUser_call method_call = new checkUser_call(username, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class checkUser_call extends org.apache.thrift.async.TAsyncMethodCall { private String username; - public checkUser_call(String username, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public checkUser_call(String username, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.username = username; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("checkUser", org.apache.thrift.protocol.TMessageType.CALL, 0)); checkUser_args args = new checkUser_args(); args.setUsername(username); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2663,35 +2801,26 @@ public class Server { } } - public void createUser(String loginName, String lastName, String firstName, String mail, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void createUser(String token, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - createUser_call method_call = new createUser_call(loginName, lastName, firstName, mail, university, resultHandler, this, ___protocolFactory, ___transport); + createUser_call method_call = new createUser_call(token, university, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class createUser_call extends org.apache.thrift.async.TAsyncMethodCall { - private String loginName; - private String lastName; - private String firstName; - private String mail; + private String token; private String university; - public createUser_call(String loginName, String lastName, String firstName, String mail, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public createUser_call(String token, String university, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.loginName = loginName; - this.lastName = lastName; - this.firstName = firstName; - this.mail = mail; + this.token = token; this.university = university; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("createUser", org.apache.thrift.protocol.TMessageType.CALL, 0)); createUser_args args = new createUser_args(); - args.setLoginName(loginName); - args.setLastName(lastName); - args.setFirstName(firstName); - args.setMail(mail); + args.setToken(token); args.setUniversity(university); args.write(prot); prot.writeMessageEnd(); @@ -2707,42 +2836,36 @@ public class Server { } } - public void writeImageRights(String imagename, String username, String lastName, String firstName, String mail, String university, String role, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeImageRights(String imagename, String token, String role, String university, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeImageRights_call method_call = new writeImageRights_call(imagename, username, lastName, firstName, mail, university, role, resultHandler, this, ___protocolFactory, ___transport); + writeImageRights_call method_call = new writeImageRights_call(imagename, token, role, university, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class writeImageRights_call extends org.apache.thrift.async.TAsyncMethodCall { private String imagename; - private String username; - private String lastName; - private String firstName; - private String mail; - private String university; + private String token; private String role; - public writeImageRights_call(String imagename, String username, String lastName, String firstName, String mail, String university, String role, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String university; + private String userID; + public writeImageRights_call(String imagename, String token, String role, String university, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; - this.username = username; - this.lastName = lastName; - this.firstName = firstName; - this.mail = mail; - this.university = university; + this.token = token; this.role = role; + this.university = university; + this.userID = userID; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("writeImageRights", org.apache.thrift.protocol.TMessageType.CALL, 0)); writeImageRights_args args = new writeImageRights_args(); args.setImagename(imagename); - args.setUsername(username); - args.setLastName(lastName); - args.setFirstName(firstName); - args.setMail(mail); - args.setUniversity(university); + args.setToken(token); args.setRole(role); + args.setUniversity(university); + args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); } @@ -2757,9 +2880,9 @@ public class Server { } } - public void writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeAdditionalImageRights_call method_call = new writeAdditionalImageRights_call(imageName, userID, isRead, isWrite, isLinkAllowed, isAdmin, resultHandler, this, ___protocolFactory, ___transport); + writeAdditionalImageRights_call method_call = new writeAdditionalImageRights_call(imageName, userID, isRead, isWrite, isLinkAllowed, isAdmin, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2771,7 +2894,8 @@ public class Server { private boolean isWrite; private boolean isLinkAllowed; private boolean isAdmin; - public writeAdditionalImageRights_call(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public writeAdditionalImageRights_call(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imageName = imageName; this.userID = userID; @@ -2779,6 +2903,7 @@ public class Server { this.isWrite = isWrite; this.isLinkAllowed = isLinkAllowed; this.isAdmin = isAdmin; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2790,6 +2915,7 @@ public class Server { args.setIsWrite(isWrite); args.setIsLinkAllowed(isLinkAllowed); args.setIsAdmin(isAdmin); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2804,42 +2930,36 @@ public class Server { } } - public void writeLectureRights(String lecturename, String username, String lastName, String firstName, String mail, String university, String role, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeLectureRights(String lectureID, String role, String token, String university, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeLectureRights_call method_call = new writeLectureRights_call(lecturename, username, lastName, firstName, mail, university, role, resultHandler, this, ___protocolFactory, ___transport); + writeLectureRights_call method_call = new writeLectureRights_call(lectureID, role, token, university, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class writeLectureRights_call extends org.apache.thrift.async.TAsyncMethodCall { - private String lecturename; - private String username; - private String lastName; - private String firstName; - private String mail; - private String university; + private String lectureID; private String role; - public writeLectureRights_call(String lecturename, String username, String lastName, String firstName, String mail, String university, String role, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + private String university; + private String userID; + public writeLectureRights_call(String lectureID, String role, String token, String university, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.lecturename = lecturename; - this.username = username; - this.lastName = lastName; - this.firstName = firstName; - this.mail = mail; - this.university = university; + this.lectureID = lectureID; this.role = role; + this.token = token; + this.university = university; + this.userID = userID; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("writeLectureRights", org.apache.thrift.protocol.TMessageType.CALL, 0)); writeLectureRights_args args = new writeLectureRights_args(); - args.setLecturename(lecturename); - args.setUsername(username); - args.setLastName(lastName); - args.setFirstName(firstName); - args.setMail(mail); - args.setUniversity(university); + args.setLectureID(lectureID); args.setRole(role); + args.setToken(token); + args.setUniversity(university); + args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); } @@ -2854,9 +2974,9 @@ public class Server { } } - public void writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeAdditionalLectureRights(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeAdditionalLectureRights_call method_call = new writeAdditionalLectureRights_call(lectureName, userID, isRead, isWrite, isAdmin, resultHandler, this, ___protocolFactory, ___transport); + writeAdditionalLectureRights_call method_call = new writeAdditionalLectureRights_call(lectureName, userID, isRead, isWrite, isAdmin, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -2867,13 +2987,15 @@ public class Server { private boolean isRead; private boolean isWrite; private boolean isAdmin; - public writeAdditionalLectureRights_call(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public writeAdditionalLectureRights_call(String lectureName, String userID, boolean isRead, boolean isWrite, boolean isAdmin, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.lectureName = lectureName; this.userID = userID; this.isRead = isRead; this.isWrite = isWrite; this.isAdmin = isAdmin; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -2884,6 +3006,7 @@ public class Server { args.setIsRead(isRead); args.setIsWrite(isWrite); args.setIsAdmin(isAdmin); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2898,24 +3021,27 @@ public class Server { } } - public void getAllOtherSatelliteUsers(List<String> userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getAllOtherSatelliteUsers(List<String> userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getAllOtherSatelliteUsers_call method_call = new getAllOtherSatelliteUsers_call(userID, resultHandler, this, ___protocolFactory, ___transport); + getAllOtherSatelliteUsers_call method_call = new getAllOtherSatelliteUsers_call(userID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getAllOtherSatelliteUsers_call extends org.apache.thrift.async.TAsyncMethodCall { private List<String> userID; - public getAllOtherSatelliteUsers_call(List<String> userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getAllOtherSatelliteUsers_call(List<String> userID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.userID = userID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllOtherSatelliteUsers", org.apache.thrift.protocol.TMessageType.CALL, 0)); getAllOtherSatelliteUsers_args args = new getAllOtherSatelliteUsers_args(); args.setUserID(userID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2930,27 +3056,30 @@ public class Server { } } - public void getPermissionForUserAndImage(String userID, String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPermissionForUserAndImage(String token, String imageID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPermissionForUserAndImage_call method_call = new getPermissionForUserAndImage_call(userID, imageID, resultHandler, this, ___protocolFactory, ___transport); + getPermissionForUserAndImage_call method_call = new getPermissionForUserAndImage_call(token, imageID, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getPermissionForUserAndImage_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; + private String token; private String imageID; - public getPermissionForUserAndImage_call(String userID, String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String userID; + public getPermissionForUserAndImage_call(String token, String imageID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; + this.token = token; this.imageID = imageID; + this.userID = userID; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getPermissionForUserAndImage", org.apache.thrift.protocol.TMessageType.CALL, 0)); getPermissionForUserAndImage_args args = new getPermissionForUserAndImage_args(); - args.setUserID(userID); + args.setToken(token); args.setImageID(imageID); + args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); } @@ -2965,24 +3094,27 @@ public class Server { } } - public void getAdditionalImageContacts(String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getAdditionalImageContacts(String imageID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getAdditionalImageContacts_call method_call = new getAdditionalImageContacts_call(imageID, resultHandler, this, ___protocolFactory, ___transport); + getAdditionalImageContacts_call method_call = new getAdditionalImageContacts_call(imageID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getAdditionalImageContacts_call extends org.apache.thrift.async.TAsyncMethodCall { private String imageID; - public getAdditionalImageContacts_call(String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getAdditionalImageContacts_call(String imageID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imageID = imageID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAdditionalImageContacts", org.apache.thrift.protocol.TMessageType.CALL, 0)); getAdditionalImageContacts_args args = new getAdditionalImageContacts_args(); args.setImageID(imageID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -2997,27 +3129,30 @@ public class Server { } } - public void getPermissionForUserAndLecture(String userID, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPermissionForUserAndLecture(String token, String lectureID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPermissionForUserAndLecture_call method_call = new getPermissionForUserAndLecture_call(userID, lectureID, resultHandler, this, ___protocolFactory, ___transport); + getPermissionForUserAndLecture_call method_call = new getPermissionForUserAndLecture_call(token, lectureID, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getPermissionForUserAndLecture_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; + private String token; private String lectureID; - public getPermissionForUserAndLecture_call(String userID, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String userID; + public getPermissionForUserAndLecture_call(String token, String lectureID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; + this.token = token; this.lectureID = lectureID; + this.userID = userID; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getPermissionForUserAndLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); getPermissionForUserAndLecture_args args = new getPermissionForUserAndLecture_args(); - args.setUserID(userID); + args.setToken(token); args.setLectureID(lectureID); + args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); } @@ -3032,19 +3167,21 @@ public class Server { } } - public void deleteAllAdditionalImagePermissions(String imageID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteAllAdditionalImagePermissions(String imageID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteAllAdditionalImagePermissions_call method_call = new deleteAllAdditionalImagePermissions_call(imageID, userID, resultHandler, this, ___protocolFactory, ___transport); + deleteAllAdditionalImagePermissions_call method_call = new deleteAllAdditionalImagePermissions_call(imageID, token, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteAllAdditionalImagePermissions_call extends org.apache.thrift.async.TAsyncMethodCall { private String imageID; + private String token; private String userID; - public deleteAllAdditionalImagePermissions_call(String imageID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteAllAdditionalImagePermissions_call(String imageID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imageID = imageID; + this.token = token; this.userID = userID; } @@ -3052,6 +3189,7 @@ public class Server { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteAllAdditionalImagePermissions", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteAllAdditionalImagePermissions_args args = new deleteAllAdditionalImagePermissions_args(); args.setImageID(imageID); + args.setToken(token); args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); @@ -3067,19 +3205,21 @@ public class Server { } } - public void deleteAllAdditionalLecturePermissions(String lectureID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteAllAdditionalLecturePermissions(String lectureID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteAllAdditionalLecturePermissions_call method_call = new deleteAllAdditionalLecturePermissions_call(lectureID, userID, resultHandler, this, ___protocolFactory, ___transport); + deleteAllAdditionalLecturePermissions_call method_call = new deleteAllAdditionalLecturePermissions_call(lectureID, token, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteAllAdditionalLecturePermissions_call extends org.apache.thrift.async.TAsyncMethodCall { private String lectureID; + private String token; private String userID; - public deleteAllAdditionalLecturePermissions_call(String lectureID, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteAllAdditionalLecturePermissions_call(String lectureID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.lectureID = lectureID; + this.token = token; this.userID = userID; } @@ -3087,6 +3227,7 @@ public class Server { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteAllAdditionalLecturePermissions", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteAllAdditionalLecturePermissions_args args = new deleteAllAdditionalLecturePermissions_args(); args.setLectureID(lectureID); + args.setToken(token); args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); @@ -3102,24 +3243,27 @@ public class Server { } } - public void getOsNameForGuestOs(String guestOS, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getOsNameForGuestOs(String guestOS, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getOsNameForGuestOs_call method_call = new getOsNameForGuestOs_call(guestOS, resultHandler, this, ___protocolFactory, ___transport); + getOsNameForGuestOs_call method_call = new getOsNameForGuestOs_call(guestOS, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getOsNameForGuestOs_call extends org.apache.thrift.async.TAsyncMethodCall { private String guestOS; - public getOsNameForGuestOs_call(String guestOS, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public getOsNameForGuestOs_call(String guestOS, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.guestOS = guestOS; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getOsNameForGuestOs", org.apache.thrift.protocol.TMessageType.CALL, 0)); getOsNameForGuestOs_args args = new getOsNameForGuestOs_args(); args.setGuestOS(guestOS); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -3134,27 +3278,30 @@ public class Server { } } - public void userIsImageAdmin(String userID, String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void userIsImageAdmin(String imageID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - userIsImageAdmin_call method_call = new userIsImageAdmin_call(userID, imageID, resultHandler, this, ___protocolFactory, ___transport); + userIsImageAdmin_call method_call = new userIsImageAdmin_call(imageID, token, userID, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class userIsImageAdmin_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userID; private String imageID; - public userIsImageAdmin_call(String userID, String imageID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + private String userID; + public userIsImageAdmin_call(String imageID, String token, String userID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.userID = userID; this.imageID = imageID; + this.token = token; + this.userID = userID; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("userIsImageAdmin", org.apache.thrift.protocol.TMessageType.CALL, 0)); userIsImageAdmin_args args = new userIsImageAdmin_args(); - args.setUserID(userID); args.setImageID(imageID); + args.setToken(token); + args.setUserID(userID); args.write(prot); prot.writeMessageEnd(); } @@ -3169,9 +3316,9 @@ public class Server { } } - public void userIsLectureAdmin(String userID, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void userIsLectureAdmin(String userID, String lectureID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - userIsLectureAdmin_call method_call = new userIsLectureAdmin_call(userID, lectureID, resultHandler, this, ___protocolFactory, ___transport); + userIsLectureAdmin_call method_call = new userIsLectureAdmin_call(userID, lectureID, token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -3179,10 +3326,12 @@ public class Server { public static class userIsLectureAdmin_call extends org.apache.thrift.async.TAsyncMethodCall { private String userID; private String lectureID; - public userIsLectureAdmin_call(String userID, String lectureID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public userIsLectureAdmin_call(String userID, String lectureID, String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.userID = userID; this.lectureID = lectureID; + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -3190,6 +3339,7 @@ public class Server { userIsLectureAdmin_args args = new userIsLectureAdmin_args(); args.setUserID(userID); args.setLectureID(lectureID); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -3204,21 +3354,24 @@ public class Server { } } - public void createRandomUUID(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void createRandomUUID(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - createRandomUUID_call method_call = new createRandomUUID_call(resultHandler, this, ___protocolFactory, ___transport); + createRandomUUID_call method_call = new createRandomUUID_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class createRandomUUID_call extends org.apache.thrift.async.TAsyncMethodCall { - public createRandomUUID_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String token; + public createRandomUUID_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); + this.token = token; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("createRandomUUID", org.apache.thrift.protocol.TMessageType.CALL, 0)); createRandomUUID_args args = new createRandomUUID_args(); + args.setToken(token); args.write(prot); prot.writeMessageEnd(); } @@ -3233,6 +3386,38 @@ public class Server { } } + public void getInstitutionByID(String institutionID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + getInstitutionByID_call method_call = new getInstitutionByID_call(institutionID, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class getInstitutionByID_call extends org.apache.thrift.async.TAsyncMethodCall { + private String institutionID; + public getInstitutionByID_call(String institutionID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.institutionID = institutionID; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getInstitutionByID", org.apache.thrift.protocol.TMessageType.CALL, 0)); + getInstitutionByID_args args = new getInstitutionByID_args(); + args.setInstitutionID(institutionID); + args.write(prot); + prot.writeMessageEnd(); + } + + public String getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_getInstitutionByID(); + } + } + } public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor { @@ -3247,7 +3432,8 @@ public class Server { private static <I extends Iface> Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(Map<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) { processMap.put("getFtpUser", new getFtpUser()); - processMap.put("setTokenForSession", new setTokenForSession()); + processMap.put("authenticated", new authenticated()); + processMap.put("setSessionInvalid", new setSessionInvalid()); processMap.put("DeleteFtpUser", new DeleteFtpUser()); processMap.put("getPathOfImage", new getPathOfImage()); processMap.put("setInstitution", new setInstitution()); @@ -3293,6 +3479,7 @@ public class Server { processMap.put("userIsImageAdmin", new userIsImageAdmin()); processMap.put("userIsLectureAdmin", new userIsLectureAdmin()); processMap.put("createRandomUUID", new createRandomUUID()); + processMap.put("getInstitutionByID", new getInstitutionByID()); return processMap; } @@ -3311,27 +3498,49 @@ public class Server { public getFtpUser_result getResult(I iface, getFtpUser_args args) throws org.apache.thrift.TException { getFtpUser_result result = new getFtpUser_result(); - result.success = iface.getFtpUser(); + result.success = iface.getFtpUser(args.token); + return result; + } + } + + public static class authenticated<I extends Iface> extends org.apache.thrift.ProcessFunction<I, authenticated_args> { + public authenticated() { + super("authenticated"); + } + + public authenticated_args getEmptyArgsInstance() { + return new authenticated_args(); + } + + protected boolean isOneway() { + return false; + } + + public authenticated_result getResult(I iface, authenticated_args args) throws org.apache.thrift.TException { + authenticated_result result = new authenticated_result(); + result.success = iface.authenticated(args.token); + result.setSuccessIsSet(true); return result; } } - public static class setTokenForSession<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setTokenForSession_args> { - public setTokenForSession() { - super("setTokenForSession"); + public static class setSessionInvalid<I extends Iface> extends org.apache.thrift.ProcessFunction<I, setSessionInvalid_args> { + public setSessionInvalid() { + super("setSessionInvalid"); } - public setTokenForSession_args getEmptyArgsInstance() { - return new setTokenForSession_args(); + public setSessionInvalid_args getEmptyArgsInstance() { + return new setSessionInvalid_args(); } protected boolean isOneway() { return false; } - public setTokenForSession_result getResult(I iface, setTokenForSession_args args) throws org.apache.thrift.TException { - setTokenForSession_result result = new setTokenForSession_result(); - iface.setTokenForSession(args.token); + public setSessionInvalid_result getResult(I iface, setSessionInvalid_args args) throws org.apache.thrift.TException { + setSessionInvalid_result result = new setSessionInvalid_result(); + result.success = iface.setSessionInvalid(args.token); + result.setSuccessIsSet(true); return result; } } @@ -3351,7 +3560,7 @@ public class Server { public DeleteFtpUser_result getResult(I iface, DeleteFtpUser_args args) throws org.apache.thrift.TException { DeleteFtpUser_result result = new DeleteFtpUser_result(); - result.success = iface.DeleteFtpUser(args.user); + result.success = iface.DeleteFtpUser(args.user, args.token); result.setSuccessIsSet(true); return result; } @@ -3372,7 +3581,7 @@ public class Server { public getPathOfImage_result getResult(I iface, getPathOfImage_args args) throws org.apache.thrift.TException { getPathOfImage_result result = new getPathOfImage_result(); - result.success = iface.getPathOfImage(args.image_id, args.version); + result.success = iface.getPathOfImage(args.image_id, args.version, args.token); return result; } } @@ -3392,7 +3601,7 @@ public class Server { public setInstitution_result getResult(I iface, setInstitution_args args) throws org.apache.thrift.TException { setInstitution_result result = new setInstitution_result(); - result.success = iface.setInstitution(args.university); + result.success = iface.setInstitution(args.university, args.token); return result; } } @@ -3412,7 +3621,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.desc, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os, args.uid); + result.success = iface.writeVLdata(args.imagename, args.desc, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os, args.uid, args.token, args.userID); result.setSuccessIsSet(true); return result; } @@ -3433,7 +3642,7 @@ public class Server { public getImageListPermissionWrite_result getResult(I iface, getImageListPermissionWrite_args args) throws org.apache.thrift.TException { getImageListPermissionWrite_result result = new getImageListPermissionWrite_result(); - result.success = iface.getImageListPermissionWrite(args.userID); + result.success = iface.getImageListPermissionWrite(args.userID, args.token); return result; } } @@ -3453,7 +3662,7 @@ public class Server { public getImageListPermissionRead_result getResult(I iface, getImageListPermissionRead_args args) throws org.apache.thrift.TException { getImageListPermissionRead_result result = new getImageListPermissionRead_result(); - result.success = iface.getImageListPermissionRead(args.userID); + result.success = iface.getImageListPermissionRead(args.userID, args.token); return result; } } @@ -3473,7 +3682,7 @@ public class Server { public getImageListPermissionLink_result getResult(I iface, getImageListPermissionLink_args args) throws org.apache.thrift.TException { getImageListPermissionLink_result result = new getImageListPermissionLink_result(); - result.success = iface.getImageListPermissionLink(args.userID); + result.success = iface.getImageListPermissionLink(args.userID, args.token); return result; } } @@ -3493,7 +3702,7 @@ public class Server { public getImageListPermissionAdmin_result getResult(I iface, getImageListPermissionAdmin_args args) throws org.apache.thrift.TException { getImageListPermissionAdmin_result result = new getImageListPermissionAdmin_result(); - result.success = iface.getImageListPermissionAdmin(args.userID); + result.success = iface.getImageListPermissionAdmin(args.userID, args.token); return result; } } @@ -3513,7 +3722,7 @@ public class Server { public getImageListAllTemplates_result getResult(I iface, getImageListAllTemplates_args args) throws org.apache.thrift.TException { getImageListAllTemplates_result result = new getImageListAllTemplates_result(); - result.success = iface.getImageListAllTemplates(); + result.success = iface.getImageListAllTemplates(args.token); return result; } } @@ -3533,7 +3742,7 @@ public class Server { public getImageList_result getResult(I iface, getImageList_args args) throws org.apache.thrift.TException { getImageList_result result = new getImageList_result(); - result.success = iface.getImageList(args.userID); + result.success = iface.getImageList(args.token); return result; } } @@ -3553,7 +3762,7 @@ public class Server { public getLectureList_result getResult(I iface, getLectureList_args args) throws org.apache.thrift.TException { getLectureList_result result = new getLectureList_result(); - result.success = iface.getLectureList(); + result.success = iface.getLectureList(args.token); return result; } } @@ -3573,7 +3782,7 @@ public class Server { public getLectureListPermissionRead_result getResult(I iface, getLectureListPermissionRead_args args) throws org.apache.thrift.TException { getLectureListPermissionRead_result result = new getLectureListPermissionRead_result(); - result.success = iface.getLectureListPermissionRead(args.userID); + result.success = iface.getLectureListPermissionRead(args.token); return result; } } @@ -3593,7 +3802,7 @@ public class Server { public getLectureListPermissionWrite_result getResult(I iface, getLectureListPermissionWrite_args args) throws org.apache.thrift.TException { getLectureListPermissionWrite_result result = new getLectureListPermissionWrite_result(); - result.success = iface.getLectureListPermissionWrite(args.userID); + result.success = iface.getLectureListPermissionWrite(args.token); return result; } } @@ -3613,7 +3822,7 @@ public class Server { public getLectureListPermissionAdmin_result getResult(I iface, getLectureListPermissionAdmin_args args) throws org.apache.thrift.TException { getLectureListPermissionAdmin_result result = new getLectureListPermissionAdmin_result(); - result.success = iface.getLectureListPermissionAdmin(args.userID); + result.success = iface.getLectureListPermissionAdmin(args.token); return result; } } @@ -3633,7 +3842,7 @@ public class Server { public getAllOS_result getResult(I iface, getAllOS_args args) throws org.apache.thrift.TException { getAllOS_result result = new getAllOS_result(); - result.success = iface.getAllOS(); + result.success = iface.getAllOS(args.token); return result; } } @@ -3653,7 +3862,7 @@ public class Server { public getAllUniversities_result getResult(I iface, getAllUniversities_args args) throws org.apache.thrift.TException { getAllUniversities_result result = new getAllUniversities_result(); - result.success = iface.getAllUniversities(); + result.success = iface.getAllUniversities(args.token); return result; } } @@ -3673,7 +3882,7 @@ public class Server { public getPersonData_result getResult(I iface, getPersonData_args args) throws org.apache.thrift.TException { getPersonData_result result = new getPersonData_result(); - result.success = iface.getPersonData(args.Vorname, args.Nachname); + result.success = iface.getPersonData(args.Vorname, args.Nachname, args.token); return result; } } @@ -3693,7 +3902,7 @@ public class Server { public getItemOwner_result getResult(I iface, getItemOwner_args args) throws org.apache.thrift.TException { getItemOwner_result result = new getItemOwner_result(); - result.success = iface.getItemOwner(args.itemID); + result.success = iface.getItemOwner(args.itemID, args.token); return result; } } @@ -3713,7 +3922,7 @@ public class Server { public setPerson_result getResult(I iface, setPerson_args args) throws org.apache.thrift.TException { setPerson_result result = new setPerson_result(); - iface.setPerson(args.login, args.lastname, args.firstname, args.mail, args.Institution); + iface.setPerson(args.userID, args.token, args.institution); return result; } } @@ -3733,7 +3942,7 @@ public class Server { public writeLecturedata_result getResult(I iface, writeLecturedata_args args) throws org.apache.thrift.TException { writeLecturedata_result result = new writeLecturedata_result(); - result.success = iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.lectureID); + result.success = iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.token, args.Tel, args.Fak, args.lectureID, args.university); result.setSuccessIsSet(true); return result; } @@ -3754,7 +3963,7 @@ public class Server { public startFileCopy_result getResult(I iface, startFileCopy_args args) throws org.apache.thrift.TException { startFileCopy_result result = new startFileCopy_result(); - result.success = iface.startFileCopy(args.file); + result.success = iface.startFileCopy(args.file, args.token); result.setSuccessIsSet(true); return result; } @@ -3775,7 +3984,7 @@ public class Server { public getImageData_result getResult(I iface, getImageData_args args) throws org.apache.thrift.TException { getImageData_result result = new getImageData_result(); - result.success = iface.getImageData(args.imageid, args.imageversion); + result.success = iface.getImageData(args.imageid, args.imageversion, args.token); return result; } } @@ -3795,7 +4004,7 @@ public class Server { public getLectureData_result getResult(I iface, getLectureData_args args) throws org.apache.thrift.TException { getLectureData_result result = new getLectureData_result(); - result.success = iface.getLectureData(args.lectureid); + result.success = iface.getLectureData(args.lectureid, args.token); return result; } } @@ -3815,7 +4024,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.desc, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os); + result.success = iface.updateImageData(args.name, args.newName, args.desc, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os, args.token); result.setSuccessIsSet(true); return result; } @@ -3836,7 +4045,7 @@ public class Server { public deleteImageData_result getResult(I iface, deleteImageData_args args) throws org.apache.thrift.TException { deleteImageData_result result = new deleteImageData_result(); - result.success = iface.deleteImageData(args.id, args.version); + result.success = iface.deleteImageData(args.id, args.version, args.token); result.setSuccessIsSet(true); return result; } @@ -3857,7 +4066,7 @@ public class Server { public updateLecturedata_result getResult(I iface, updateLecturedata_args args) throws org.apache.thrift.TException { updateLecturedata_result result = new updateLecturedata_result(); - result.success = iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imageid, args.imageversion, args.user, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.id); + result.success = iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imageid, args.imageversion, args.token, args.Tel, args.Fak, args.id, args.university); result.setSuccessIsSet(true); return result; } @@ -3878,7 +4087,7 @@ public class Server { public deleteImageServer_result getResult(I iface, deleteImageServer_args args) throws org.apache.thrift.TException { deleteImageServer_result result = new deleteImageServer_result(); - result.success = iface.deleteImageServer(args.id, args.version); + result.success = iface.deleteImageServer(args.id, args.version, args.token); result.setSuccessIsSet(true); return result; } @@ -3899,7 +4108,7 @@ public class Server { public connectedToLecture_result getResult(I iface, connectedToLecture_args args) throws org.apache.thrift.TException { connectedToLecture_result result = new connectedToLecture_result(); - result.success = iface.connectedToLecture(args.id, args.version); + result.success = iface.connectedToLecture(args.id, args.version, args.token); result.setSuccessIsSet(true); return result; } @@ -3920,7 +4129,7 @@ public class Server { public deleteLecture_result getResult(I iface, deleteLecture_args args) throws org.apache.thrift.TException { deleteLecture_result result = new deleteLecture_result(); - result.success = iface.deleteLecture(args.id, args.hs, args.user); + result.success = iface.deleteLecture(args.id, args.token, args.university); result.setSuccessIsSet(true); return result; } @@ -3941,7 +4150,7 @@ public class Server { public checkUser_result getResult(I iface, checkUser_args args) throws org.apache.thrift.TException { checkUser_result result = new checkUser_result(); - result.success = iface.checkUser(args.username); + result.success = iface.checkUser(args.username, args.token); result.setSuccessIsSet(true); return result; } @@ -3962,7 +4171,7 @@ public class Server { public createUser_result getResult(I iface, createUser_args args) throws org.apache.thrift.TException { createUser_result result = new createUser_result(); - result.success = iface.createUser(args.loginName, args.lastName, args.firstName, args.mail, args.university); + result.success = iface.createUser(args.token, args.university); result.setSuccessIsSet(true); return result; } @@ -3983,7 +4192,7 @@ public class Server { public writeImageRights_result getResult(I iface, writeImageRights_args args) throws org.apache.thrift.TException { writeImageRights_result result = new writeImageRights_result(); - result.success = iface.writeImageRights(args.imagename, args.username, args.lastName, args.firstName, args.mail, args.university, args.role); + result.success = iface.writeImageRights(args.imagename, args.token, args.role, args.university, args.userID); result.setSuccessIsSet(true); return result; } @@ -4004,7 +4213,7 @@ public class Server { public writeAdditionalImageRights_result getResult(I iface, writeAdditionalImageRights_args args) throws org.apache.thrift.TException { writeAdditionalImageRights_result result = new writeAdditionalImageRights_result(); - result.success = iface.writeAdditionalImageRights(args.imageName, args.userID, args.isRead, args.isWrite, args.isLinkAllowed, args.isAdmin); + result.success = iface.writeAdditionalImageRights(args.imageName, args.userID, args.isRead, args.isWrite, args.isLinkAllowed, args.isAdmin, args.token); result.setSuccessIsSet(true); return result; } @@ -4025,7 +4234,7 @@ public class Server { public writeLectureRights_result getResult(I iface, writeLectureRights_args args) throws org.apache.thrift.TException { writeLectureRights_result result = new writeLectureRights_result(); - result.success = iface.writeLectureRights(args.lecturename, args.username, args.lastName, args.firstName, args.mail, args.university, args.role); + result.success = iface.writeLectureRights(args.lectureID, args.role, args.token, args.university, args.userID); result.setSuccessIsSet(true); return result; } @@ -4046,7 +4255,7 @@ public class Server { public writeAdditionalLectureRights_result getResult(I iface, writeAdditionalLectureRights_args args) throws org.apache.thrift.TException { writeAdditionalLectureRights_result result = new writeAdditionalLectureRights_result(); - result.success = iface.writeAdditionalLectureRights(args.lectureName, args.userID, args.isRead, args.isWrite, args.isAdmin); + result.success = iface.writeAdditionalLectureRights(args.lectureName, args.userID, args.isRead, args.isWrite, args.isAdmin, args.token); result.setSuccessIsSet(true); return result; } @@ -4067,7 +4276,7 @@ public class Server { public getAllOtherSatelliteUsers_result getResult(I iface, getAllOtherSatelliteUsers_args args) throws org.apache.thrift.TException { getAllOtherSatelliteUsers_result result = new getAllOtherSatelliteUsers_result(); - result.success = iface.getAllOtherSatelliteUsers(args.userID); + result.success = iface.getAllOtherSatelliteUsers(args.userID, args.token); return result; } } @@ -4087,7 +4296,7 @@ public class Server { public getPermissionForUserAndImage_result getResult(I iface, getPermissionForUserAndImage_args args) throws org.apache.thrift.TException { getPermissionForUserAndImage_result result = new getPermissionForUserAndImage_result(); - result.success = iface.getPermissionForUserAndImage(args.userID, args.imageID); + result.success = iface.getPermissionForUserAndImage(args.token, args.imageID, args.userID); return result; } } @@ -4107,7 +4316,7 @@ public class Server { public getAdditionalImageContacts_result getResult(I iface, getAdditionalImageContacts_args args) throws org.apache.thrift.TException { getAdditionalImageContacts_result result = new getAdditionalImageContacts_result(); - result.success = iface.getAdditionalImageContacts(args.imageID); + result.success = iface.getAdditionalImageContacts(args.imageID, args.token); return result; } } @@ -4127,7 +4336,7 @@ public class Server { public getPermissionForUserAndLecture_result getResult(I iface, getPermissionForUserAndLecture_args args) throws org.apache.thrift.TException { getPermissionForUserAndLecture_result result = new getPermissionForUserAndLecture_result(); - result.success = iface.getPermissionForUserAndLecture(args.userID, args.lectureID); + result.success = iface.getPermissionForUserAndLecture(args.token, args.lectureID, args.userID); return result; } } @@ -4147,7 +4356,7 @@ public class Server { public deleteAllAdditionalImagePermissions_result getResult(I iface, deleteAllAdditionalImagePermissions_args args) throws org.apache.thrift.TException { deleteAllAdditionalImagePermissions_result result = new deleteAllAdditionalImagePermissions_result(); - iface.deleteAllAdditionalImagePermissions(args.imageID, args.userID); + iface.deleteAllAdditionalImagePermissions(args.imageID, args.token, args.userID); return result; } } @@ -4167,7 +4376,7 @@ public class Server { public deleteAllAdditionalLecturePermissions_result getResult(I iface, deleteAllAdditionalLecturePermissions_args args) throws org.apache.thrift.TException { deleteAllAdditionalLecturePermissions_result result = new deleteAllAdditionalLecturePermissions_result(); - iface.deleteAllAdditionalLecturePermissions(args.lectureID, args.userID); + iface.deleteAllAdditionalLecturePermissions(args.lectureID, args.token, args.userID); return result; } } @@ -4187,7 +4396,7 @@ public class Server { public getOsNameForGuestOs_result getResult(I iface, getOsNameForGuestOs_args args) throws org.apache.thrift.TException { getOsNameForGuestOs_result result = new getOsNameForGuestOs_result(); - result.success = iface.getOsNameForGuestOs(args.guestOS); + result.success = iface.getOsNameForGuestOs(args.guestOS, args.token); return result; } } @@ -4207,7 +4416,7 @@ public class Server { public userIsImageAdmin_result getResult(I iface, userIsImageAdmin_args args) throws org.apache.thrift.TException { userIsImageAdmin_result result = new userIsImageAdmin_result(); - result.success = iface.userIsImageAdmin(args.userID, args.imageID); + result.success = iface.userIsImageAdmin(args.imageID, args.token, args.userID); result.setSuccessIsSet(true); return result; } @@ -4228,7 +4437,7 @@ public class Server { public userIsLectureAdmin_result getResult(I iface, userIsLectureAdmin_args args) throws org.apache.thrift.TException { userIsLectureAdmin_result result = new userIsLectureAdmin_result(); - result.success = iface.userIsLectureAdmin(args.userID, args.lectureID); + result.success = iface.userIsLectureAdmin(args.userID, args.lectureID, args.token); result.setSuccessIsSet(true); return result; } @@ -4249,7 +4458,27 @@ public class Server { public createRandomUUID_result getResult(I iface, createRandomUUID_args args) throws org.apache.thrift.TException { createRandomUUID_result result = new createRandomUUID_result(); - result.success = iface.createRandomUUID(); + result.success = iface.createRandomUUID(args.token); + return result; + } + } + + public static class getInstitutionByID<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getInstitutionByID_args> { + public getInstitutionByID() { + super("getInstitutionByID"); + } + + public getInstitutionByID_args getEmptyArgsInstance() { + return new getInstitutionByID_args(); + } + + protected boolean isOneway() { + return false; + } + + public getInstitutionByID_result getResult(I iface, getInstitutionByID_args args) throws org.apache.thrift.TException { + getInstitutionByID_result result = new getInstitutionByID_result(); + result.success = iface.getInstitutionByID(args.institutionID); return result; } } @@ -4268,7 +4497,8 @@ public class Server { private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { processMap.put("getFtpUser", new getFtpUser()); - processMap.put("setTokenForSession", new setTokenForSession()); + processMap.put("authenticated", new authenticated()); + processMap.put("setSessionInvalid", new setSessionInvalid()); processMap.put("DeleteFtpUser", new DeleteFtpUser()); processMap.put("getPathOfImage", new getPathOfImage()); processMap.put("setInstitution", new setInstitution()); @@ -4314,6 +4544,7 @@ public class Server { processMap.put("userIsImageAdmin", new userIsImageAdmin()); processMap.put("userIsLectureAdmin", new userIsLectureAdmin()); processMap.put("createRandomUUID", new createRandomUUID()); + processMap.put("getInstitutionByID", new getInstitutionByID()); return processMap; } @@ -4364,24 +4595,78 @@ public class Server { } public void start(I iface, getFtpUser_args args, org.apache.thrift.async.AsyncMethodCallback<User> resultHandler) throws TException { - iface.getFtpUser(resultHandler); + iface.getFtpUser(args.token,resultHandler); } } - public static class setTokenForSession<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setTokenForSession_args, Void> { - public setTokenForSession() { - super("setTokenForSession"); + public static class authenticated<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, authenticated_args, Boolean> { + public authenticated() { + super("authenticated"); } - public setTokenForSession_args getEmptyArgsInstance() { - return new setTokenForSession_args(); + public authenticated_args getEmptyArgsInstance() { + return new authenticated_args(); } - public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback<Void>() { - public void onComplete(Void o) { - setTokenForSession_result result = new setTokenForSession_result(); + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + authenticated_result result = new authenticated_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + authenticated_result result = new authenticated_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, authenticated_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.authenticated(args.token,resultHandler); + } + } + + public static class setSessionInvalid<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setSessionInvalid_args, Boolean> { + public setSessionInvalid() { + super("setSessionInvalid"); + } + + public setSessionInvalid_args getEmptyArgsInstance() { + return new setSessionInvalid_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + setSessionInvalid_result result = new setSessionInvalid_result(); + result.success = o; + result.setSuccessIsSet(true); try { fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); return; @@ -4393,7 +4678,7 @@ public class Server { public void onError(Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TBase msg; - setTokenForSession_result result = new setTokenForSession_result(); + setSessionInvalid_result result = new setSessionInvalid_result(); { msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); @@ -4413,8 +4698,8 @@ public class Server { return false; } - public void start(I iface, setTokenForSession_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { - iface.setTokenForSession(args.token,resultHandler); + public void start(I iface, setSessionInvalid_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.setSessionInvalid(args.token,resultHandler); } } @@ -4466,7 +4751,7 @@ public class Server { } public void start(I iface, DeleteFtpUser_args args, org.apache.thrift.async.AsyncMethodCallback<Long> resultHandler) throws TException { - iface.DeleteFtpUser(args.user,resultHandler); + iface.DeleteFtpUser(args.user, args.token,resultHandler); } } @@ -4517,7 +4802,7 @@ public class Server { } public void start(I iface, getPathOfImage_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.getPathOfImage(args.image_id, args.version,resultHandler); + iface.getPathOfImage(args.image_id, args.version, args.token,resultHandler); } } @@ -4568,7 +4853,7 @@ public class Server { } public void start(I iface, setInstitution_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.setInstitution(args.university,resultHandler); + iface.setInstitution(args.university, args.token,resultHandler); } } @@ -4620,7 +4905,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.desc, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os, args.uid,resultHandler); + iface.writeVLdata(args.imagename, args.desc, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os, args.uid, args.token, args.userID,resultHandler); } } @@ -4671,7 +4956,7 @@ public class Server { } public void start(I iface, getImageListPermissionWrite_args args, org.apache.thrift.async.AsyncMethodCallback<List<Image>> resultHandler) throws TException { - iface.getImageListPermissionWrite(args.userID,resultHandler); + iface.getImageListPermissionWrite(args.userID, args.token,resultHandler); } } @@ -4722,7 +5007,7 @@ public class Server { } public void start(I iface, getImageListPermissionRead_args args, org.apache.thrift.async.AsyncMethodCallback<List<Image>> resultHandler) throws TException { - iface.getImageListPermissionRead(args.userID,resultHandler); + iface.getImageListPermissionRead(args.userID, args.token,resultHandler); } } @@ -4773,7 +5058,7 @@ public class Server { } public void start(I iface, getImageListPermissionLink_args args, org.apache.thrift.async.AsyncMethodCallback<List<Image>> resultHandler) throws TException { - iface.getImageListPermissionLink(args.userID,resultHandler); + iface.getImageListPermissionLink(args.userID, args.token,resultHandler); } } @@ -4824,7 +5109,7 @@ public class Server { } public void start(I iface, getImageListPermissionAdmin_args args, org.apache.thrift.async.AsyncMethodCallback<List<Image>> resultHandler) throws TException { - iface.getImageListPermissionAdmin(args.userID,resultHandler); + iface.getImageListPermissionAdmin(args.userID, args.token,resultHandler); } } @@ -4875,7 +5160,7 @@ public class Server { } public void start(I iface, getImageListAllTemplates_args args, org.apache.thrift.async.AsyncMethodCallback<List<Image>> resultHandler) throws TException { - iface.getImageListAllTemplates(resultHandler); + iface.getImageListAllTemplates(args.token,resultHandler); } } @@ -4926,7 +5211,7 @@ public class Server { } public void start(I iface, getImageList_args args, org.apache.thrift.async.AsyncMethodCallback<List<Image>> resultHandler) throws TException { - iface.getImageList(args.userID,resultHandler); + iface.getImageList(args.token,resultHandler); } } @@ -4977,7 +5262,7 @@ public class Server { } public void start(I iface, getLectureList_args args, org.apache.thrift.async.AsyncMethodCallback<List<Lecture>> resultHandler) throws TException { - iface.getLectureList(resultHandler); + iface.getLectureList(args.token,resultHandler); } } @@ -5028,7 +5313,7 @@ public class Server { } public void start(I iface, getLectureListPermissionRead_args args, org.apache.thrift.async.AsyncMethodCallback<List<Lecture>> resultHandler) throws TException { - iface.getLectureListPermissionRead(args.userID,resultHandler); + iface.getLectureListPermissionRead(args.token,resultHandler); } } @@ -5079,7 +5364,7 @@ public class Server { } public void start(I iface, getLectureListPermissionWrite_args args, org.apache.thrift.async.AsyncMethodCallback<List<Lecture>> resultHandler) throws TException { - iface.getLectureListPermissionWrite(args.userID,resultHandler); + iface.getLectureListPermissionWrite(args.token,resultHandler); } } @@ -5130,7 +5415,7 @@ public class Server { } public void start(I iface, getLectureListPermissionAdmin_args args, org.apache.thrift.async.AsyncMethodCallback<List<Lecture>> resultHandler) throws TException { - iface.getLectureListPermissionAdmin(args.userID,resultHandler); + iface.getLectureListPermissionAdmin(args.token,resultHandler); } } @@ -5181,7 +5466,7 @@ public class Server { } public void start(I iface, getAllOS_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException { - iface.getAllOS(resultHandler); + iface.getAllOS(args.token,resultHandler); } } @@ -5232,7 +5517,7 @@ public class Server { } public void start(I iface, getAllUniversities_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException { - iface.getAllUniversities(resultHandler); + iface.getAllUniversities(args.token,resultHandler); } } @@ -5283,7 +5568,7 @@ public class Server { } public void start(I iface, getPersonData_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,String>> resultHandler) throws TException { - iface.getPersonData(args.Vorname, args.Nachname,resultHandler); + iface.getPersonData(args.Vorname, args.Nachname, args.token,resultHandler); } } @@ -5334,7 +5619,7 @@ public class Server { } public void start(I iface, getItemOwner_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,String>> resultHandler) throws TException { - iface.getItemOwner(args.itemID,resultHandler); + iface.getItemOwner(args.itemID, args.token,resultHandler); } } @@ -5384,7 +5669,7 @@ public class Server { } public void start(I iface, setPerson_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { - iface.setPerson(args.login, args.lastname, args.firstname, args.mail, args.Institution,resultHandler); + iface.setPerson(args.userID, args.token, args.institution,resultHandler); } } @@ -5436,7 +5721,7 @@ public class Server { } public void start(I iface, writeLecturedata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.lectureID,resultHandler); + iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.token, args.Tel, args.Fak, args.lectureID, args.university,resultHandler); } } @@ -5488,7 +5773,7 @@ public class Server { } public void start(I iface, startFileCopy_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.startFileCopy(args.file,resultHandler); + iface.startFileCopy(args.file, args.token,resultHandler); } } @@ -5539,7 +5824,7 @@ public class Server { } public void start(I iface, getImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,String>> resultHandler) throws TException { - iface.getImageData(args.imageid, args.imageversion,resultHandler); + iface.getImageData(args.imageid, args.imageversion, args.token,resultHandler); } } @@ -5590,7 +5875,7 @@ public class Server { } public void start(I iface, getLectureData_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,String>> resultHandler) throws TException { - iface.getLectureData(args.lectureid,resultHandler); + iface.getLectureData(args.lectureid, args.token,resultHandler); } } @@ -5642,7 +5927,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.desc, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os,resultHandler); + iface.updateImageData(args.name, args.newName, args.desc, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os, args.token,resultHandler); } } @@ -5694,7 +5979,7 @@ public class Server { } public void start(I iface, deleteImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteImageData(args.id, args.version,resultHandler); + iface.deleteImageData(args.id, args.version, args.token,resultHandler); } } @@ -5746,7 +6031,7 @@ public class Server { } public void start(I iface, updateLecturedata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imageid, args.imageversion, args.user, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.id,resultHandler); + iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imageid, args.imageversion, args.token, args.Tel, args.Fak, args.id, args.university,resultHandler); } } @@ -5798,7 +6083,7 @@ public class Server { } public void start(I iface, deleteImageServer_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteImageServer(args.id, args.version,resultHandler); + iface.deleteImageServer(args.id, args.version, args.token,resultHandler); } } @@ -5850,7 +6135,7 @@ public class Server { } public void start(I iface, connectedToLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.connectedToLecture(args.id, args.version,resultHandler); + iface.connectedToLecture(args.id, args.version, args.token,resultHandler); } } @@ -5902,7 +6187,7 @@ public class Server { } public void start(I iface, deleteLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteLecture(args.id, args.hs, args.user,resultHandler); + iface.deleteLecture(args.id, args.token, args.university,resultHandler); } } @@ -5954,7 +6239,7 @@ public class Server { } public void start(I iface, checkUser_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.checkUser(args.username,resultHandler); + iface.checkUser(args.username, args.token,resultHandler); } } @@ -6006,7 +6291,7 @@ public class Server { } public void start(I iface, createUser_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.createUser(args.loginName, args.lastName, args.firstName, args.mail, args.university,resultHandler); + iface.createUser(args.token, args.university,resultHandler); } } @@ -6058,7 +6343,7 @@ public class Server { } public void start(I iface, writeImageRights_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeImageRights(args.imagename, args.username, args.lastName, args.firstName, args.mail, args.university, args.role,resultHandler); + iface.writeImageRights(args.imagename, args.token, args.role, args.university, args.userID,resultHandler); } } @@ -6110,7 +6395,7 @@ public class Server { } public void start(I iface, writeAdditionalImageRights_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeAdditionalImageRights(args.imageName, args.userID, args.isRead, args.isWrite, args.isLinkAllowed, args.isAdmin,resultHandler); + iface.writeAdditionalImageRights(args.imageName, args.userID, args.isRead, args.isWrite, args.isLinkAllowed, args.isAdmin, args.token,resultHandler); } } @@ -6162,7 +6447,7 @@ public class Server { } public void start(I iface, writeLectureRights_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeLectureRights(args.lecturename, args.username, args.lastName, args.firstName, args.mail, args.university, args.role,resultHandler); + iface.writeLectureRights(args.lectureID, args.role, args.token, args.university, args.userID,resultHandler); } } @@ -6214,7 +6499,7 @@ public class Server { } public void start(I iface, writeAdditionalLectureRights_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeAdditionalLectureRights(args.lectureName, args.userID, args.isRead, args.isWrite, args.isAdmin,resultHandler); + iface.writeAdditionalLectureRights(args.lectureName, args.userID, args.isRead, args.isWrite, args.isAdmin, args.token,resultHandler); } } @@ -6265,7 +6550,7 @@ public class Server { } public void start(I iface, getAllOtherSatelliteUsers_args args, org.apache.thrift.async.AsyncMethodCallback<List<Person>> resultHandler) throws TException { - iface.getAllOtherSatelliteUsers(args.userID,resultHandler); + iface.getAllOtherSatelliteUsers(args.userID, args.token,resultHandler); } } @@ -6316,7 +6601,7 @@ public class Server { } public void start(I iface, getPermissionForUserAndImage_args args, org.apache.thrift.async.AsyncMethodCallback<List<Person>> resultHandler) throws TException { - iface.getPermissionForUserAndImage(args.userID, args.imageID,resultHandler); + iface.getPermissionForUserAndImage(args.token, args.imageID, args.userID,resultHandler); } } @@ -6367,7 +6652,7 @@ public class Server { } public void start(I iface, getAdditionalImageContacts_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException { - iface.getAdditionalImageContacts(args.imageID,resultHandler); + iface.getAdditionalImageContacts(args.imageID, args.token,resultHandler); } } @@ -6418,7 +6703,7 @@ public class Server { } public void start(I iface, getPermissionForUserAndLecture_args args, org.apache.thrift.async.AsyncMethodCallback<List<Person>> resultHandler) throws TException { - iface.getPermissionForUserAndLecture(args.userID, args.lectureID,resultHandler); + iface.getPermissionForUserAndLecture(args.token, args.lectureID, args.userID,resultHandler); } } @@ -6468,7 +6753,7 @@ public class Server { } public void start(I iface, deleteAllAdditionalImagePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { - iface.deleteAllAdditionalImagePermissions(args.imageID, args.userID,resultHandler); + iface.deleteAllAdditionalImagePermissions(args.imageID, args.token, args.userID,resultHandler); } } @@ -6518,7 +6803,7 @@ public class Server { } public void start(I iface, deleteAllAdditionalLecturePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException { - iface.deleteAllAdditionalLecturePermissions(args.lectureID, args.userID,resultHandler); + iface.deleteAllAdditionalLecturePermissions(args.lectureID, args.token, args.userID,resultHandler); } } @@ -6569,7 +6854,7 @@ public class Server { } public void start(I iface, getOsNameForGuestOs_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.getOsNameForGuestOs(args.guestOS,resultHandler); + iface.getOsNameForGuestOs(args.guestOS, args.token,resultHandler); } } @@ -6621,7 +6906,7 @@ public class Server { } public void start(I iface, userIsImageAdmin_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.userIsImageAdmin(args.userID, args.imageID,resultHandler); + iface.userIsImageAdmin(args.imageID, args.token, args.userID,resultHandler); } } @@ -6673,7 +6958,7 @@ public class Server { } public void start(I iface, userIsLectureAdmin_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.userIsLectureAdmin(args.userID, args.lectureID,resultHandler); + iface.userIsLectureAdmin(args.userID, args.lectureID, args.token,resultHandler); } } @@ -6724,7 +7009,58 @@ public class Server { } public void start(I iface, createRandomUUID_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { - iface.createRandomUUID(resultHandler); + iface.createRandomUUID(args.token,resultHandler); + } + } + + public static class getInstitutionByID<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getInstitutionByID_args, String> { + public getInstitutionByID() { + super("getInstitutionByID"); + } + + public getInstitutionByID_args getEmptyArgsInstance() { + return new getInstitutionByID_args(); + } + + public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<String>() { + public void onComplete(String o) { + getInstitutionByID_result result = new getInstitutionByID_result(); + result.success = o; + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getInstitutionByID_result result = new getInstitutionByID_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getInstitutionByID_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException { + iface.getInstitutionByID(args.institutionID,resultHandler); } } @@ -6733,6 +7069,7 @@ public class Server { public static class getFtpUser_args implements org.apache.thrift.TBase<getFtpUser_args, getFtpUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<getFtpUser_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getFtpUser_args"); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -6740,10 +7077,11 @@ public class Server { schemes.put(TupleScheme.class, new getFtpUser_argsTupleSchemeFactory()); } + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -6758,6 +7096,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // TOKEN + return TOKEN; default: return null; } @@ -6796,9 +7136,13 @@ public class Server { return _fieldName; } } + + // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getFtpUser_args.class, metaDataMap); } @@ -6806,10 +7150,20 @@ public class Server { public getFtpUser_args() { } + public getFtpUser_args( + String token) + { + this(); + this.token = token; + } + /** * Performs a deep copy on <i>other</i>. */ public getFtpUser_args(getFtpUser_args other) { + if (other.isSetToken()) { + this.token = other.token; + } } public getFtpUser_args deepCopy() { @@ -6818,15 +7172,51 @@ public class Server { @Override public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public getFtpUser_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -6838,6 +7228,8 @@ public class Server { } switch (field) { + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -6855,6 +7247,15 @@ public class Server { if (that == null) return false; + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -6871,6 +7272,16 @@ public class Server { int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -6891,6 +7302,13 @@ public class Server { StringBuilder sb = new StringBuilder("getFtpUser_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -6934,6 +7352,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -6949,6 +7375,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -6966,11 +7397,24 @@ public class Server { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getFtpUser_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getFtpUser_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -7335,15 +7779,15 @@ public class Server { } - public static class setTokenForSession_args implements org.apache.thrift.TBase<setTokenForSession_args, setTokenForSession_args._Fields>, java.io.Serializable, Cloneable, Comparable<setTokenForSession_args> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTokenForSession_args"); + public static class authenticated_args implements org.apache.thrift.TBase<authenticated_args, authenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<authenticated_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticated_args"); private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { - schemes.put(StandardScheme.class, new setTokenForSession_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new setTokenForSession_argsTupleSchemeFactory()); + schemes.put(StandardScheme.class, new authenticated_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new authenticated_argsTupleSchemeFactory()); } public String token; // required @@ -7413,13 +7857,13 @@ public class Server { tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTokenForSession_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticated_args.class, metaDataMap); } - public setTokenForSession_args() { + public authenticated_args() { } - public setTokenForSession_args( + public authenticated_args( String token) { this(); @@ -7429,14 +7873,14 @@ public class Server { /** * Performs a deep copy on <i>other</i>. */ - public setTokenForSession_args(setTokenForSession_args other) { + public authenticated_args(authenticated_args other) { if (other.isSetToken()) { this.token = other.token; } } - public setTokenForSession_args deepCopy() { - return new setTokenForSession_args(this); + public authenticated_args deepCopy() { + return new authenticated_args(this); } @Override @@ -7448,7 +7892,7 @@ public class Server { return this.token; } - public setTokenForSession_args setToken(String token) { + public authenticated_args setToken(String token) { this.token = token; return this; } @@ -7507,12 +7951,12 @@ public class Server { public boolean equals(Object that) { if (that == null) return false; - if (that instanceof setTokenForSession_args) - return this.equals((setTokenForSession_args)that); + if (that instanceof authenticated_args) + return this.equals((authenticated_args)that); return false; } - public boolean equals(setTokenForSession_args that) { + public boolean equals(authenticated_args that) { if (that == null) return false; @@ -7534,7 +7978,7 @@ public class Server { } @Override - public int compareTo(setTokenForSession_args other) { + public int compareTo(authenticated_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -7568,7 +8012,7 @@ public class Server { @Override public String toString() { - StringBuilder sb = new StringBuilder("setTokenForSession_args("); + StringBuilder sb = new StringBuilder("authenticated_args("); boolean first = true; sb.append("token:"); @@ -7603,15 +8047,15 @@ public class Server { } } - private static class setTokenForSession_argsStandardSchemeFactory implements SchemeFactory { - public setTokenForSession_argsStandardScheme getScheme() { - return new setTokenForSession_argsStandardScheme(); + private static class authenticated_argsStandardSchemeFactory implements SchemeFactory { + public authenticated_argsStandardScheme getScheme() { + return new authenticated_argsStandardScheme(); } } - private static class setTokenForSession_argsStandardScheme extends StandardScheme<setTokenForSession_args> { + private static class authenticated_argsStandardScheme extends StandardScheme<authenticated_args> { - public void read(org.apache.thrift.protocol.TProtocol iprot, setTokenForSession_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, authenticated_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -7640,7 +8084,7 @@ public class Server { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, setTokenForSession_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, authenticated_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -7655,16 +8099,16 @@ public class Server { } - private static class setTokenForSession_argsTupleSchemeFactory implements SchemeFactory { - public setTokenForSession_argsTupleScheme getScheme() { - return new setTokenForSession_argsTupleScheme(); + private static class authenticated_argsTupleSchemeFactory implements SchemeFactory { + public authenticated_argsTupleScheme getScheme() { + return new authenticated_argsTupleScheme(); } } - private static class setTokenForSession_argsTupleScheme extends TupleScheme<setTokenForSession_args> { + private static class authenticated_argsTupleScheme extends TupleScheme<authenticated_args> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setTokenForSession_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, authenticated_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.isSetToken()) { @@ -7677,7 +8121,7 @@ public class Server { } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setTokenForSession_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, authenticated_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { @@ -7689,20 +8133,22 @@ public class Server { } - public static class setTokenForSession_result implements org.apache.thrift.TBase<setTokenForSession_result, setTokenForSession_result._Fields>, java.io.Serializable, Cloneable, Comparable<setTokenForSession_result> { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTokenForSession_result"); + public static class authenticated_result implements org.apache.thrift.TBase<authenticated_result, authenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<authenticated_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticated_result"); + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { - schemes.put(StandardScheme.class, new setTokenForSession_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new setTokenForSession_resultTupleSchemeFactory()); + schemes.put(StandardScheme.class, new authenticated_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new authenticated_resultTupleSchemeFactory()); } + public boolean success; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + SUCCESS((short)0, "success"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -7717,6 +8163,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; default: return null; } @@ -7755,37 +8203,89 @@ public class Server { return _fieldName; } } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTokenForSession_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticated_result.class, metaDataMap); + } + + public authenticated_result() { } - public setTokenForSession_result() { + public authenticated_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); } /** * Performs a deep copy on <i>other</i>. */ - public setTokenForSession_result(setTokenForSession_result other) { + public authenticated_result(authenticated_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; } - public setTokenForSession_result deepCopy() { - return new setTokenForSession_result(this); + public authenticated_result deepCopy() { + return new authenticated_result(this); } @Override public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public authenticated_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + } throw new IllegalStateException(); } @@ -7797,6 +8297,8 @@ public class Server { } switch (field) { + case SUCCESS: + return isSetSuccess(); } throw new IllegalStateException(); } @@ -7805,15 +8307,24 @@ public class Server { public boolean equals(Object that) { if (that == null) return false; - if (that instanceof setTokenForSession_result) - return this.equals((setTokenForSession_result)that); + if (that instanceof authenticated_result) + return this.equals((authenticated_result)that); return false; } - public boolean equals(setTokenForSession_result that) { + public boolean equals(authenticated_result that) { if (that == null) return false; + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + return true; } @@ -7823,13 +8334,23 @@ public class Server { } @Override - public int compareTo(setTokenForSession_result other) { + public int compareTo(authenticated_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -7847,9 +8368,368 @@ public class Server { @Override public String toString() { - StringBuilder sb = new StringBuilder("setTokenForSession_result("); + StringBuilder sb = new StringBuilder("authenticated_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class authenticated_resultStandardSchemeFactory implements SchemeFactory { + public authenticated_resultStandardScheme getScheme() { + return new authenticated_resultStandardScheme(); + } + } + + private static class authenticated_resultStandardScheme extends StandardScheme<authenticated_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, authenticated_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, authenticated_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class authenticated_resultTupleSchemeFactory implements SchemeFactory { + public authenticated_resultTupleScheme getScheme() { + return new authenticated_resultTupleScheme(); + } + } + + private static class authenticated_resultTupleScheme extends TupleScheme<authenticated_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, authenticated_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, authenticated_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + + public static class setSessionInvalid_args implements org.apache.thrift.TBase<setSessionInvalid_args, setSessionInvalid_args._Fields>, java.io.Serializable, Cloneable, Comparable<setSessionInvalid_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSessionInvalid_args"); + + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new setSessionInvalid_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new setSessionInvalid_argsTupleSchemeFactory()); + } + + public String token; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + TOKEN((short)1, "token"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // TOKEN + return TOKEN; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSessionInvalid_args.class, metaDataMap); + } + + public setSessionInvalid_args() { + } + + public setSessionInvalid_args( + String token) + { + this(); + this.token = token; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public setSessionInvalid_args(setSessionInvalid_args other) { + if (other.isSetToken()) { + this.token = other.token; + } + } + + public setSessionInvalid_args deepCopy() { + return new setSessionInvalid_args(this); + } + + @Override + public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public setSessionInvalid_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case TOKEN: + return getToken(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case TOKEN: + return isSetToken(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof setSessionInvalid_args) + return this.equals((setSessionInvalid_args)that); + return false; + } + + public boolean equals(setSessionInvalid_args that) { + if (that == null) + return false; + + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(setSessionInvalid_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("setSessionInvalid_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -7875,15 +8755,15 @@ public class Server { } } - private static class setTokenForSession_resultStandardSchemeFactory implements SchemeFactory { - public setTokenForSession_resultStandardScheme getScheme() { - return new setTokenForSession_resultStandardScheme(); + private static class setSessionInvalid_argsStandardSchemeFactory implements SchemeFactory { + public setSessionInvalid_argsStandardScheme getScheme() { + return new setSessionInvalid_argsStandardScheme(); } } - private static class setTokenForSession_resultStandardScheme extends StandardScheme<setTokenForSession_result> { + private static class setSessionInvalid_argsStandardScheme extends StandardScheme<setSessionInvalid_args> { - public void read(org.apache.thrift.protocol.TProtocol iprot, setTokenForSession_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setSessionInvalid_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -7893,6 +8773,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -7904,32 +8792,404 @@ public class Server { struct.validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot, setTokenForSession_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setSessionInvalid_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setTokenForSession_resultTupleSchemeFactory implements SchemeFactory { - public setTokenForSession_resultTupleScheme getScheme() { - return new setTokenForSession_resultTupleScheme(); + private static class setSessionInvalid_argsTupleSchemeFactory implements SchemeFactory { + public setSessionInvalid_argsTupleScheme getScheme() { + return new setSessionInvalid_argsTupleScheme(); } } - private static class setTokenForSession_resultTupleScheme extends TupleScheme<setTokenForSession_result> { + private static class setSessionInvalid_argsTupleScheme extends TupleScheme<setSessionInvalid_args> { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setTokenForSession_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setSessionInvalid_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setTokenForSession_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setSessionInvalid_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } + } + } + + } + + public static class setSessionInvalid_result implements org.apache.thrift.TBase<setSessionInvalid_result, setSessionInvalid_result._Fields>, java.io.Serializable, Cloneable, Comparable<setSessionInvalid_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSessionInvalid_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new setSessionInvalid_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new setSessionInvalid_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSessionInvalid_result.class, metaDataMap); + } + + public setSessionInvalid_result() { + } + + public setSessionInvalid_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public setSessionInvalid_result(setSessionInvalid_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public setSessionInvalid_result deepCopy() { + return new setSessionInvalid_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public setSessionInvalid_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof setSessionInvalid_result) + return this.equals((setSessionInvalid_result)that); + return false; + } + + public boolean equals(setSessionInvalid_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(setSessionInvalid_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("setSessionInvalid_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class setSessionInvalid_resultStandardSchemeFactory implements SchemeFactory { + public setSessionInvalid_resultStandardScheme getScheme() { + return new setSessionInvalid_resultStandardScheme(); + } + } + + private static class setSessionInvalid_resultStandardScheme extends StandardScheme<setSessionInvalid_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, setSessionInvalid_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, setSessionInvalid_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class setSessionInvalid_resultTupleSchemeFactory implements SchemeFactory { + public setSessionInvalid_resultTupleScheme getScheme() { + return new setSessionInvalid_resultTupleScheme(); + } + } + + private static class setSessionInvalid_resultTupleScheme extends TupleScheme<setSessionInvalid_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, setSessionInvalid_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, setSessionInvalid_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } } } @@ -7939,6 +9199,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -7947,10 +9208,12 @@ public class Server { } public String user; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER((short)1, "user"); + USER((short)1, "user"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -7967,6 +9230,8 @@ public class Server { switch(fieldId) { case 1: // USER return USER; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -8012,6 +9277,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DeleteFtpUser_args.class, metaDataMap); } @@ -8020,10 +9287,12 @@ public class Server { } public DeleteFtpUser_args( - String user) + String user, + String token) { this(); this.user = user; + this.token = token; } /** @@ -8033,6 +9302,9 @@ public class Server { if (other.isSetUser()) { this.user = other.user; } + if (other.isSetToken()) { + this.token = other.token; + } } public DeleteFtpUser_args deepCopy() { @@ -8042,6 +9314,7 @@ public class Server { @Override public void clear() { this.user = null; + this.token = null; } public String getUser() { @@ -8068,6 +9341,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public DeleteFtpUser_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER: @@ -8078,6 +9375,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -8086,6 +9391,9 @@ public class Server { case USER: return getUser(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -8099,6 +9407,8 @@ public class Server { switch (field) { case USER: return isSetUser(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -8125,6 +9435,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -8151,6 +9470,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -8178,6 +9507,14 @@ public class Server { sb.append(this.user); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -8229,6 +9566,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -8249,6 +9594,11 @@ public class Server { oprot.writeString(struct.user); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -8270,20 +9620,30 @@ public class Server { if (struct.isSetUser()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUser()) { oprot.writeString(struct.user); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, DeleteFtpUser_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.user = iprot.readString(); struct.setUserIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -8648,6 +10008,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -8657,11 +10018,13 @@ public class Server { public String image_id; // required public String version; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { IMAGE_ID((short)1, "image_id"), - VERSION((short)2, "version"); + VERSION((short)2, "version"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -8680,6 +10043,8 @@ public class Server { return IMAGE_ID; case 2: // VERSION return VERSION; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -8727,6 +10092,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathOfImage_args.class, metaDataMap); } @@ -8736,11 +10103,13 @@ public class Server { public getPathOfImage_args( String image_id, - String version) + String version, + String token) { this(); this.image_id = image_id; this.version = version; + this.token = token; } /** @@ -8753,6 +10122,9 @@ public class Server { if (other.isSetVersion()) { this.version = other.version; } + if (other.isSetToken()) { + this.token = other.token; + } } public getPathOfImage_args deepCopy() { @@ -8763,6 +10135,7 @@ public class Server { public void clear() { this.image_id = null; this.version = null; + this.token = null; } public String getImage_id() { @@ -8813,6 +10186,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getPathOfImage_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGE_ID: @@ -8831,6 +10228,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -8842,6 +10247,9 @@ public class Server { case VERSION: return getVersion(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -8857,6 +10265,8 @@ public class Server { return isSetImage_id(); case VERSION: return isSetVersion(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -8892,6 +10302,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -8928,6 +10347,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -8963,6 +10392,14 @@ public class Server { sb.append(this.version); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -9022,6 +10459,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -9047,6 +10492,11 @@ public class Server { oprot.writeString(struct.version); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -9071,19 +10521,25 @@ public class Server { if (struct.isSetVersion()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetImage_id()) { oprot.writeString(struct.image_id); } if (struct.isSetVersion()) { oprot.writeString(struct.version); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.image_id = iprot.readString(); struct.setImage_idIsSet(true); @@ -9092,6 +10548,10 @@ public class Server { struct.version = iprot.readString(); struct.setVersionIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -9455,6 +10915,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setInstitution_args"); 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)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -9463,10 +10924,12 @@ public class Server { } public String university; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - UNIVERSITY((short)1, "university"); + UNIVERSITY((short)1, "university"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -9483,6 +10946,8 @@ public class Server { switch(fieldId) { case 1: // UNIVERSITY return UNIVERSITY; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -9528,6 +10993,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setInstitution_args.class, metaDataMap); } @@ -9536,10 +11003,12 @@ public class Server { } public setInstitution_args( - String university) + String university, + String token) { this(); this.university = university; + this.token = token; } /** @@ -9549,6 +11018,9 @@ public class Server { if (other.isSetUniversity()) { this.university = other.university; } + if (other.isSetToken()) { + this.token = other.token; + } } public setInstitution_args deepCopy() { @@ -9558,6 +11030,7 @@ public class Server { @Override public void clear() { this.university = null; + this.token = null; } public String getUniversity() { @@ -9584,6 +11057,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public setInstitution_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case UNIVERSITY: @@ -9594,6 +11091,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -9602,6 +11107,9 @@ public class Server { case UNIVERSITY: return getUniversity(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -9615,6 +11123,8 @@ public class Server { switch (field) { case UNIVERSITY: return isSetUniversity(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -9641,6 +11151,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -9667,6 +11186,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -9694,6 +11223,14 @@ public class Server { sb.append(this.university); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -9745,6 +11282,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -9765,6 +11310,11 @@ public class Server { oprot.writeString(struct.university); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -9786,20 +11336,30 @@ public class Server { if (struct.isSetUniversity()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUniversity()) { oprot.writeString(struct.university); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, setInstitution_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -10164,11 +11724,6 @@ public class Server { 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); @@ -10181,6 +11736,8 @@ public class Server { 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 UID_FIELD_DESC = new org.apache.thrift.protocol.TField("uid", org.apache.thrift.protocol.TType.STRING, (short)19); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)20); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)21); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -10190,11 +11747,6 @@ public class Server { public String imagename; // required public String desc; // required - public String login; // required - public String firstname; // required - public String lastname; // required - public String university; // required - public String Mail; // required public String Tel; // required public String Fak; // required public boolean license; // required @@ -10207,16 +11759,13 @@ public class Server { public long shareMode; // required public String os; // required public String uid; // required + public String token; // required + public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { 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"), @@ -10228,7 +11777,9 @@ public class Server { FILESIZE((short)16, "filesize"), SHARE_MODE((short)17, "shareMode"), OS((short)18, "os"), - UID((short)19, "uid"); + UID((short)19, "uid"), + TOKEN((short)20, "token"), + USER_ID((short)21, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -10247,16 +11798,6 @@ public class Server { return IMAGENAME; case 2: // DESC return DESC; - case 3: // LOGIN - return LOGIN; - case 4: // FIRSTNAME - return FIRSTNAME; - case 5: // LASTNAME - return LASTNAME; - case 6: // UNIVERSITY - return UNIVERSITY; - case 7: // MAIL - return MAIL; case 8: // TEL return TEL; case 9: // FAK @@ -10281,6 +11822,10 @@ public class Server { return OS; case 19: // UID return UID; + case 20: // TOKEN + return TOKEN; + case 21: // USER_ID + return USER_ID; default: return null; } @@ -10336,16 +11881,6 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DESC, new org.apache.thrift.meta_data.FieldMetaData("desc", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LOGIN, new org.apache.thrift.meta_data.FieldMetaData("login", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRSTNAME, new org.apache.thrift.meta_data.FieldMetaData("firstname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LASTNAME, new org.apache.thrift.meta_data.FieldMetaData("lastname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("Mail", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TEL, new org.apache.thrift.meta_data.FieldMetaData("Tel", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.FAK, new org.apache.thrift.meta_data.FieldMetaData("Fak", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -10370,6 +11905,10 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.UID, new org.apache.thrift.meta_data.FieldMetaData("uid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeVLdata_args.class, metaDataMap); } @@ -10380,11 +11919,6 @@ public class Server { public writeVLdata_args( String imagename, String desc, - String login, - String firstname, - String lastname, - String university, - String Mail, String Tel, String Fak, boolean license, @@ -10396,16 +11930,13 @@ public class Server { long filesize, long shareMode, String os, - String uid) + String uid, + String token, + String userID) { this(); this.imagename = imagename; this.desc = desc; - this.login = login; - this.firstname = firstname; - this.lastname = lastname; - this.university = university; - this.Mail = Mail; this.Tel = Tel; this.Fak = Fak; this.license = license; @@ -10425,6 +11956,8 @@ public class Server { setShareModeIsSet(true); this.os = os; this.uid = uid; + this.token = token; + this.userID = userID; } /** @@ -10438,21 +11971,6 @@ public class Server { if (other.isSetDesc()) { this.desc = other.desc; } - if (other.isSetLogin()) { - this.login = other.login; - } - if (other.isSetFirstname()) { - this.firstname = other.firstname; - } - if (other.isSetLastname()) { - this.lastname = other.lastname; - } - if (other.isSetUniversity()) { - this.university = other.university; - } - if (other.isSetMail()) { - this.Mail = other.Mail; - } if (other.isSetTel()) { this.Tel = other.Tel; } @@ -10475,6 +11993,12 @@ public class Server { if (other.isSetUid()) { this.uid = other.uid; } + if (other.isSetToken()) { + this.token = other.token; + } + if (other.isSetUserID()) { + this.userID = other.userID; + } } public writeVLdata_args deepCopy() { @@ -10485,11 +12009,6 @@ public class Server { public void clear() { this.imagename = null; this.desc = null; - this.login = null; - this.firstname = null; - this.lastname = null; - this.university = null; - this.Mail = null; this.Tel = null; this.Fak = null; setLicenseIsSet(false); @@ -10509,6 +12028,8 @@ public class Server { this.shareMode = 0; this.os = null; this.uid = null; + this.token = null; + this.userID = null; } public String getImagename() { @@ -10559,126 +12080,6 @@ public class Server { } } - public String getLogin() { - return this.login; - } - - public writeVLdata_args setLogin(String login) { - this.login = login; - return this; - } - - public void unsetLogin() { - this.login = null; - } - - /** Returns true if field login is set (has been assigned a value) and false otherwise */ - public boolean isSetLogin() { - return this.login != null; - } - - public void setLoginIsSet(boolean value) { - if (!value) { - this.login = null; - } - } - - public String getFirstname() { - return this.firstname; - } - - public writeVLdata_args setFirstname(String firstname) { - this.firstname = firstname; - return this; - } - - public void unsetFirstname() { - this.firstname = null; - } - - /** Returns true if field firstname is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstname() { - return this.firstname != null; - } - - public void setFirstnameIsSet(boolean value) { - if (!value) { - this.firstname = null; - } - } - - public String getLastname() { - return this.lastname; - } - - public writeVLdata_args setLastname(String lastname) { - this.lastname = lastname; - return this; - } - - public void unsetLastname() { - this.lastname = null; - } - - /** Returns true if field lastname is set (has been assigned a value) and false otherwise */ - public boolean isSetLastname() { - return this.lastname != null; - } - - public void setLastnameIsSet(boolean value) { - if (!value) { - this.lastname = null; - } - } - - public String getUniversity() { - return this.university; - } - - public writeVLdata_args setUniversity(String university) { - this.university = university; - return this; - } - - public void unsetUniversity() { - this.university = null; - } - - /** Returns true if field university is set (has been assigned a value) and false otherwise */ - public boolean isSetUniversity() { - return this.university != null; - } - - public void setUniversityIsSet(boolean value) { - if (!value) { - this.university = null; - } - } - - public String getMail() { - return this.Mail; - } - - public writeVLdata_args setMail(String Mail) { - this.Mail = Mail; - return this; - } - - public void unsetMail() { - this.Mail = null; - } - - /** Returns true if field Mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.Mail != null; - } - - public void setMailIsSet(boolean value) { - if (!value) { - this.Mail = null; - } - } - public String getTel() { return this.Tel; } @@ -10960,6 +12361,54 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public writeVLdata_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + + public String getUserID() { + return this.userID; + } + + public writeVLdata_args setUserID(String userID) { + this.userID = userID; + return this; + } + + public void unsetUserID() { + this.userID = null; + } + + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; + } + + public void setUserIDIsSet(boolean value) { + if (!value) { + this.userID = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGENAME: @@ -10978,46 +12427,6 @@ public class Server { } break; - case LOGIN: - if (value == null) { - unsetLogin(); - } else { - setLogin((String)value); - } - break; - - case FIRSTNAME: - if (value == null) { - unsetFirstname(); - } else { - setFirstname((String)value); - } - break; - - case LASTNAME: - if (value == null) { - unsetLastname(); - } else { - setLastname((String)value); - } - break; - - case UNIVERSITY: - if (value == null) { - unsetUniversity(); - } else { - setUniversity((String)value); - } - break; - - case MAIL: - if (value == null) { - unsetMail(); - } else { - setMail((String)value); - } - break; - case TEL: if (value == null) { unsetTel(); @@ -11114,6 +12523,22 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + + case USER_ID: + if (value == null) { + unsetUserID(); + } else { + setUserID((String)value); + } + break; + } } @@ -11125,21 +12550,6 @@ public class Server { case DESC: return getDesc(); - case LOGIN: - return getLogin(); - - case FIRSTNAME: - return getFirstname(); - - case LASTNAME: - return getLastname(); - - case UNIVERSITY: - return getUniversity(); - - case MAIL: - return getMail(); - case TEL: return getTel(); @@ -11176,6 +12586,12 @@ public class Server { case UID: return getUid(); + case TOKEN: + return getToken(); + + case USER_ID: + return getUserID(); + } throw new IllegalStateException(); } @@ -11191,16 +12607,6 @@ public class Server { return isSetImagename(); case DESC: return isSetDesc(); - case LOGIN: - return isSetLogin(); - case FIRSTNAME: - return isSetFirstname(); - case LASTNAME: - return isSetLastname(); - case UNIVERSITY: - return isSetUniversity(); - case MAIL: - return isSetMail(); case TEL: return isSetTel(); case FAK: @@ -11225,6 +12631,10 @@ public class Server { return isSetOs(); case UID: return isSetUid(); + case TOKEN: + return isSetToken(); + case USER_ID: + return isSetUserID(); } throw new IllegalStateException(); } @@ -11260,51 +12670,6 @@ public class Server { return false; } - boolean this_present_login = true && this.isSetLogin(); - boolean that_present_login = true && that.isSetLogin(); - if (this_present_login || that_present_login) { - if (!(this_present_login && that_present_login)) - return false; - if (!this.login.equals(that.login)) - return false; - } - - boolean this_present_firstname = true && this.isSetFirstname(); - boolean that_present_firstname = true && that.isSetFirstname(); - if (this_present_firstname || that_present_firstname) { - if (!(this_present_firstname && that_present_firstname)) - return false; - if (!this.firstname.equals(that.firstname)) - return false; - } - - boolean this_present_lastname = true && this.isSetLastname(); - boolean that_present_lastname = true && that.isSetLastname(); - if (this_present_lastname || that_present_lastname) { - if (!(this_present_lastname && that_present_lastname)) - return false; - if (!this.lastname.equals(that.lastname)) - return false; - } - - boolean this_present_university = true && this.isSetUniversity(); - boolean that_present_university = true && that.isSetUniversity(); - if (this_present_university || that_present_university) { - if (!(this_present_university && that_present_university)) - return false; - if (!this.university.equals(that.university)) - return false; - } - - boolean this_present_Mail = true && this.isSetMail(); - boolean that_present_Mail = true && that.isSetMail(); - if (this_present_Mail || that_present_Mail) { - if (!(this_present_Mail && that_present_Mail)) - return false; - if (!this.Mail.equals(that.Mail)) - return false; - } - boolean this_present_Tel = true && this.isSetTel(); boolean that_present_Tel = true && that.isSetTel(); if (this_present_Tel || that_present_Tel) { @@ -11413,6 +12778,24 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) + return false; + if (!this.userID.equals(that.userID)) + return false; + } + return true; } @@ -11449,56 +12832,6 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLogin()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetFirstname()).compareTo(other.isSetFirstname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetFirstname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstname, other.firstname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastname()).compareTo(other.isSetLastname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastname, other.lastname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetUniversity()).compareTo(other.isSetUniversity()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUniversity()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.university, other.university); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.Mail, other.Mail); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetTel()).compareTo(other.isSetTel()); if (lastComparison != 0) { return lastComparison; @@ -11619,6 +12952,26 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -11655,46 +13008,6 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("login:"); - if (this.login == null) { - sb.append("null"); - } else { - sb.append(this.login); - } - first = false; - if (!first) sb.append(", "); - sb.append("firstname:"); - if (this.firstname == null) { - sb.append("null"); - } else { - sb.append(this.firstname); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastname:"); - if (this.lastname == null) { - sb.append("null"); - } else { - sb.append(this.lastname); - } - first = false; - if (!first) sb.append(", "); - sb.append("university:"); - if (this.university == null) { - sb.append("null"); - } else { - sb.append(this.university); - } - first = false; - if (!first) sb.append(", "); - sb.append("Mail:"); - if (this.Mail == null) { - sb.append("null"); - } else { - sb.append(this.Mail); - } - first = false; - if (!first) sb.append(", "); sb.append("Tel:"); if (this.Tel == null) { sb.append("null"); @@ -11762,6 +13075,22 @@ public class Server { sb.append(this.uid); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; + if (!first) sb.append(", "); + sb.append("userID:"); + if (this.userID == null) { + sb.append("null"); + } else { + sb.append(this.userID); + } + first = false; sb.append(")"); return sb.toString(); } @@ -11823,46 +13152,6 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // LOGIN - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.login = iprot.readString(); - struct.setLoginIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // FIRSTNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // LASTNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 6: // UNIVERSITY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.university = iprot.readString(); - struct.setUniversityIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 7: // MAIL - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.Mail = iprot.readString(); - struct.setMailIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; case 8: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); @@ -11959,6 +13248,22 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 20: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 21: // USER_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -11984,31 +13289,6 @@ public class Server { oprot.writeString(struct.desc); oprot.writeFieldEnd(); } - if (struct.login != null) { - oprot.writeFieldBegin(LOGIN_FIELD_DESC); - oprot.writeString(struct.login); - oprot.writeFieldEnd(); - } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); - oprot.writeFieldEnd(); - } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); - oprot.writeFieldEnd(); - } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); - oprot.writeFieldEnd(); - } - if (struct.Mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.Mail); - oprot.writeFieldEnd(); - } if (struct.Tel != null) { oprot.writeFieldBegin(TEL_FIELD_DESC); oprot.writeString(struct.Tel); @@ -12055,6 +13335,16 @@ public class Server { oprot.writeString(struct.uid); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -12079,79 +13369,55 @@ public class Server { if (struct.isSetDesc()) { optionals.set(1); } - if (struct.isSetLogin()) { + if (struct.isSetTel()) { optionals.set(2); } - if (struct.isSetFirstname()) { + if (struct.isSetFak()) { optionals.set(3); } - if (struct.isSetLastname()) { + if (struct.isSetLicense()) { optionals.set(4); } - if (struct.isSetUniversity()) { + if (struct.isSetInternet()) { optionals.set(5); } - if (struct.isSetMail()) { + if (struct.isSetRam()) { optionals.set(6); } - if (struct.isSetTel()) { + if (struct.isSetCpu()) { optionals.set(7); } - if (struct.isSetFak()) { + if (struct.isSetImagePath()) { optionals.set(8); } - if (struct.isSetLicense()) { + if (struct.isSetIsTemplate()) { optionals.set(9); } - if (struct.isSetInternet()) { + if (struct.isSetFilesize()) { optionals.set(10); } - if (struct.isSetRam()) { + if (struct.isSetShareMode()) { optionals.set(11); } - if (struct.isSetCpu()) { + if (struct.isSetOs()) { optionals.set(12); } - if (struct.isSetImagePath()) { + if (struct.isSetUid()) { optionals.set(13); } - if (struct.isSetIsTemplate()) { + if (struct.isSetToken()) { optionals.set(14); } - if (struct.isSetFilesize()) { + if (struct.isSetUserID()) { optionals.set(15); } - if (struct.isSetShareMode()) { - optionals.set(16); - } - if (struct.isSetOs()) { - optionals.set(17); - } - if (struct.isSetUid()) { - optionals.set(18); - } - oprot.writeBitSet(optionals, 19); + oprot.writeBitSet(optionals, 16); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } if (struct.isSetDesc()) { oprot.writeString(struct.desc); } - if (struct.isSetLogin()) { - oprot.writeString(struct.login); - } - if (struct.isSetFirstname()) { - oprot.writeString(struct.firstname); - } - if (struct.isSetLastname()) { - oprot.writeString(struct.lastname); - } - if (struct.isSetUniversity()) { - oprot.writeString(struct.university); - } - if (struct.isSetMail()) { - oprot.writeString(struct.Mail); - } if (struct.isSetTel()) { oprot.writeString(struct.Tel); } @@ -12188,12 +13454,18 @@ public class Server { if (struct.isSetUid()) { oprot.writeString(struct.uid); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(19); + BitSet incoming = iprot.readBitSet(16); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -12203,73 +13475,61 @@ public class Server { struct.setDescIsSet(true); } if (incoming.get(2)) { - struct.login = iprot.readString(); - struct.setLoginIsSet(true); - } - if (incoming.get(3)) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } - if (incoming.get(4)) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } - if (incoming.get(5)) { - struct.university = iprot.readString(); - struct.setUniversityIsSet(true); - } - if (incoming.get(6)) { - struct.Mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(7)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(3)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(4)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(5)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(6)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(12)) { + if (incoming.get(7)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(13)) { + if (incoming.get(8)) { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); } - if (incoming.get(14)) { + if (incoming.get(9)) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); } - if (incoming.get(15)) { + if (incoming.get(10)) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); } - if (incoming.get(16)) { + if (incoming.get(11)) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); } - if (incoming.get(17)) { + if (incoming.get(12)) { struct.os = iprot.readString(); struct.setOsIsSet(true); } - if (incoming.get(18)) { + if (incoming.get(13)) { struct.uid = iprot.readString(); struct.setUidIsSet(true); } + if (incoming.get(14)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } + if (incoming.get(15)) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } } } @@ -12633,6 +13893,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageListPermissionWrite_args"); private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -12641,10 +13902,12 @@ public class Server { } public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + USER_ID((short)1, "userID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -12661,6 +13924,8 @@ public class Server { switch(fieldId) { case 1: // USER_ID return USER_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -12706,6 +13971,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageListPermissionWrite_args.class, metaDataMap); } @@ -12714,10 +13981,12 @@ public class Server { } public getImageListPermissionWrite_args( - String userID) + String userID, + String token) { this(); this.userID = userID; + this.token = token; } /** @@ -12727,6 +13996,9 @@ public class Server { if (other.isSetUserID()) { this.userID = other.userID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getImageListPermissionWrite_args deepCopy() { @@ -12736,6 +14008,7 @@ public class Server { @Override public void clear() { this.userID = null; + this.token = null; } public String getUserID() { @@ -12762,6 +14035,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getImageListPermissionWrite_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER_ID: @@ -12772,6 +14069,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -12780,6 +14085,9 @@ public class Server { case USER_ID: return getUserID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -12793,6 +14101,8 @@ public class Server { switch (field) { case USER_ID: return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -12819,6 +14129,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -12845,6 +14164,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -12872,6 +14201,14 @@ public class Server { sb.append(this.userID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -12923,6 +14260,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -12943,6 +14288,11 @@ public class Server { oprot.writeString(struct.userID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -12964,20 +14314,30 @@ public class Server { if (struct.isSetUserID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { oprot.writeString(struct.userID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageListPermissionWrite_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -13395,6 +14755,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageListPermissionRead_args"); private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -13403,10 +14764,12 @@ public class Server { } public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + USER_ID((short)1, "userID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -13423,6 +14786,8 @@ public class Server { switch(fieldId) { case 1: // USER_ID return USER_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -13468,6 +14833,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageListPermissionRead_args.class, metaDataMap); } @@ -13476,10 +14843,12 @@ public class Server { } public getImageListPermissionRead_args( - String userID) + String userID, + String token) { this(); this.userID = userID; + this.token = token; } /** @@ -13489,6 +14858,9 @@ public class Server { if (other.isSetUserID()) { this.userID = other.userID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getImageListPermissionRead_args deepCopy() { @@ -13498,6 +14870,7 @@ public class Server { @Override public void clear() { this.userID = null; + this.token = null; } public String getUserID() { @@ -13524,6 +14897,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getImageListPermissionRead_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER_ID: @@ -13534,6 +14931,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -13542,6 +14947,9 @@ public class Server { case USER_ID: return getUserID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -13555,6 +14963,8 @@ public class Server { switch (field) { case USER_ID: return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -13581,6 +14991,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -13607,6 +15026,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -13634,6 +15063,14 @@ public class Server { sb.append(this.userID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -13685,6 +15122,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -13705,6 +15150,11 @@ public class Server { oprot.writeString(struct.userID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -13726,20 +15176,30 @@ public class Server { if (struct.isSetUserID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { oprot.writeString(struct.userID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageListPermissionRead_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -14157,6 +15617,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageListPermissionLink_args"); private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -14165,10 +15626,12 @@ public class Server { } public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + USER_ID((short)1, "userID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -14185,6 +15648,8 @@ public class Server { switch(fieldId) { case 1: // USER_ID return USER_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -14230,6 +15695,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageListPermissionLink_args.class, metaDataMap); } @@ -14238,10 +15705,12 @@ public class Server { } public getImageListPermissionLink_args( - String userID) + String userID, + String token) { this(); this.userID = userID; + this.token = token; } /** @@ -14251,6 +15720,9 @@ public class Server { if (other.isSetUserID()) { this.userID = other.userID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getImageListPermissionLink_args deepCopy() { @@ -14260,6 +15732,7 @@ public class Server { @Override public void clear() { this.userID = null; + this.token = null; } public String getUserID() { @@ -14286,6 +15759,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getImageListPermissionLink_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER_ID: @@ -14296,6 +15793,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -14304,6 +15809,9 @@ public class Server { case USER_ID: return getUserID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -14317,6 +15825,8 @@ public class Server { switch (field) { case USER_ID: return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -14343,6 +15853,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -14369,6 +15888,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -14396,6 +15925,14 @@ public class Server { sb.append(this.userID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -14447,6 +15984,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -14467,6 +16012,11 @@ public class Server { oprot.writeString(struct.userID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -14488,20 +16038,30 @@ public class Server { if (struct.isSetUserID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { oprot.writeString(struct.userID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageListPermissionLink_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -14919,6 +16479,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageListPermissionAdmin_args"); private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -14927,10 +16488,12 @@ public class Server { } public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + USER_ID((short)1, "userID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -14947,6 +16510,8 @@ public class Server { switch(fieldId) { case 1: // USER_ID return USER_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -14992,6 +16557,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageListPermissionAdmin_args.class, metaDataMap); } @@ -15000,10 +16567,12 @@ public class Server { } public getImageListPermissionAdmin_args( - String userID) + String userID, + String token) { this(); this.userID = userID; + this.token = token; } /** @@ -15013,6 +16582,9 @@ public class Server { if (other.isSetUserID()) { this.userID = other.userID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getImageListPermissionAdmin_args deepCopy() { @@ -15022,6 +16594,7 @@ public class Server { @Override public void clear() { this.userID = null; + this.token = null; } public String getUserID() { @@ -15048,6 +16621,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getImageListPermissionAdmin_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER_ID: @@ -15058,6 +16655,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -15066,6 +16671,9 @@ public class Server { case USER_ID: return getUserID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -15079,6 +16687,8 @@ public class Server { switch (field) { case USER_ID: return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -15105,6 +16715,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -15131,6 +16750,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -15158,6 +16787,14 @@ public class Server { sb.append(this.userID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -15209,6 +16846,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -15229,6 +16874,11 @@ public class Server { oprot.writeString(struct.userID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -15250,20 +16900,30 @@ public class Server { if (struct.isSetUserID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { oprot.writeString(struct.userID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageListPermissionAdmin_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -15680,6 +17340,7 @@ public class Server { public static class getImageListAllTemplates_args implements org.apache.thrift.TBase<getImageListAllTemplates_args, getImageListAllTemplates_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageListAllTemplates_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageListAllTemplates_args"); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -15687,10 +17348,11 @@ public class Server { schemes.put(TupleScheme.class, new getImageListAllTemplates_argsTupleSchemeFactory()); } + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -15705,6 +17367,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // TOKEN + return TOKEN; default: return null; } @@ -15743,9 +17407,13 @@ public class Server { return _fieldName; } } + + // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageListAllTemplates_args.class, metaDataMap); } @@ -15753,10 +17421,20 @@ public class Server { public getImageListAllTemplates_args() { } + public getImageListAllTemplates_args( + String token) + { + this(); + this.token = token; + } + /** * Performs a deep copy on <i>other</i>. */ public getImageListAllTemplates_args(getImageListAllTemplates_args other) { + if (other.isSetToken()) { + this.token = other.token; + } } public getImageListAllTemplates_args deepCopy() { @@ -15765,15 +17443,51 @@ public class Server { @Override public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public getImageListAllTemplates_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -15785,6 +17499,8 @@ public class Server { } switch (field) { + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -15802,6 +17518,15 @@ public class Server { if (that == null) return false; + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -15818,6 +17543,16 @@ public class Server { int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -15838,6 +17573,13 @@ public class Server { StringBuilder sb = new StringBuilder("getImageListAllTemplates_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -15881,6 +17623,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -15896,6 +17646,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -15913,11 +17668,24 @@ public class Server { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getImageListAllTemplates_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageListAllTemplates_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -16334,7 +18102,7 @@ public class Server { public static class getImageList_args implements org.apache.thrift.TBase<getImageList_args, getImageList_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageList_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageList_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -16342,11 +18110,11 @@ public class Server { schemes.put(TupleScheme.class, new getImageList_argsTupleSchemeFactory()); } - public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -16361,8 +18129,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; + case 1: // TOKEN + return TOKEN; default: return null; } @@ -16406,7 +18174,7 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageList_args.class, metaDataMap); @@ -16416,18 +18184,18 @@ public class Server { } public getImageList_args( - String userID) + String token) { this(); - this.userID = userID; + this.token = token; } /** * Performs a deep copy on <i>other</i>. */ public getImageList_args(getImageList_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; + if (other.isSetToken()) { + this.token = other.token; } } @@ -16437,40 +18205,40 @@ public class Server { @Override public void clear() { - this.userID = null; + this.token = null; } - public String getUserID() { - return this.userID; + public String getToken() { + return this.token; } - public getImageList_args setUserID(String userID) { - this.userID = userID; + public getImageList_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case TOKEN: if (value == null) { - unsetUserID(); + unsetToken(); } else { - setUserID((String)value); + setToken((String)value); } break; @@ -16479,8 +18247,8 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); + case TOKEN: + return getToken(); } throw new IllegalStateException(); @@ -16493,8 +18261,8 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -16512,12 +18280,12 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.userID.equals(that.userID)) + if (!this.token.equals(that.token)) return false; } @@ -16537,12 +18305,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -16567,11 +18335,11 @@ public class Server { StringBuilder sb = new StringBuilder("getImageList_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.token); } first = false; sb.append(")"); @@ -16617,10 +18385,10 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -16640,9 +18408,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -16663,12 +18431,12 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getImageList_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(0); } oprot.writeBitSet(optionals, 1); - if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } } @@ -16677,8 +18445,8 @@ public class Server { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } } } @@ -17096,6 +18864,7 @@ public class Server { public static class getLectureList_args implements org.apache.thrift.TBase<getLectureList_args, getLectureList_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureList_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLectureList_args"); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -17103,10 +18872,11 @@ public class Server { schemes.put(TupleScheme.class, new getLectureList_argsTupleSchemeFactory()); } + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -17121,6 +18891,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // TOKEN + return TOKEN; default: return null; } @@ -17159,9 +18931,13 @@ public class Server { return _fieldName; } } + + // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureList_args.class, metaDataMap); } @@ -17169,10 +18945,20 @@ public class Server { public getLectureList_args() { } + public getLectureList_args( + String token) + { + this(); + this.token = token; + } + /** * Performs a deep copy on <i>other</i>. */ public getLectureList_args(getLectureList_args other) { + if (other.isSetToken()) { + this.token = other.token; + } } public getLectureList_args deepCopy() { @@ -17181,15 +18967,51 @@ public class Server { @Override public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public getLectureList_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -17201,6 +19023,8 @@ public class Server { } switch (field) { + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -17218,6 +19042,15 @@ public class Server { if (that == null) return false; + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -17234,6 +19067,16 @@ public class Server { int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -17254,6 +19097,13 @@ public class Server { StringBuilder sb = new StringBuilder("getLectureList_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -17297,6 +19147,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -17312,6 +19170,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -17329,11 +19192,24 @@ public class Server { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getLectureList_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getLectureList_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -17750,7 +19626,7 @@ public class Server { public static class getLectureListPermissionRead_args implements org.apache.thrift.TBase<getLectureListPermissionRead_args, getLectureListPermissionRead_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureListPermissionRead_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLectureListPermissionRead_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -17758,11 +19634,11 @@ public class Server { schemes.put(TupleScheme.class, new getLectureListPermissionRead_argsTupleSchemeFactory()); } - public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -17777,8 +19653,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; + case 1: // TOKEN + return TOKEN; default: return null; } @@ -17822,7 +19698,7 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureListPermissionRead_args.class, metaDataMap); @@ -17832,18 +19708,18 @@ public class Server { } public getLectureListPermissionRead_args( - String userID) + String token) { this(); - this.userID = userID; + this.token = token; } /** * Performs a deep copy on <i>other</i>. */ public getLectureListPermissionRead_args(getLectureListPermissionRead_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; + if (other.isSetToken()) { + this.token = other.token; } } @@ -17853,40 +19729,40 @@ public class Server { @Override public void clear() { - this.userID = null; + this.token = null; } - public String getUserID() { - return this.userID; + public String getToken() { + return this.token; } - public getLectureListPermissionRead_args setUserID(String userID) { - this.userID = userID; + public getLectureListPermissionRead_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case TOKEN: if (value == null) { - unsetUserID(); + unsetToken(); } else { - setUserID((String)value); + setToken((String)value); } break; @@ -17895,8 +19771,8 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); + case TOKEN: + return getToken(); } throw new IllegalStateException(); @@ -17909,8 +19785,8 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -17928,12 +19804,12 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.userID.equals(that.userID)) + if (!this.token.equals(that.token)) return false; } @@ -17953,12 +19829,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -17983,11 +19859,11 @@ public class Server { StringBuilder sb = new StringBuilder("getLectureListPermissionRead_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.token); } first = false; sb.append(")"); @@ -18033,10 +19909,10 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -18056,9 +19932,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -18079,12 +19955,12 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getLectureListPermissionRead_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(0); } oprot.writeBitSet(optionals, 1); - if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } } @@ -18093,8 +19969,8 @@ public class Server { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } } } @@ -18512,7 +20388,7 @@ public class Server { public static class getLectureListPermissionWrite_args implements org.apache.thrift.TBase<getLectureListPermissionWrite_args, getLectureListPermissionWrite_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureListPermissionWrite_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLectureListPermissionWrite_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -18520,11 +20396,11 @@ public class Server { schemes.put(TupleScheme.class, new getLectureListPermissionWrite_argsTupleSchemeFactory()); } - public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -18539,8 +20415,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; + case 1: // TOKEN + return TOKEN; default: return null; } @@ -18584,7 +20460,7 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureListPermissionWrite_args.class, metaDataMap); @@ -18594,18 +20470,18 @@ public class Server { } public getLectureListPermissionWrite_args( - String userID) + String token) { this(); - this.userID = userID; + this.token = token; } /** * Performs a deep copy on <i>other</i>. */ public getLectureListPermissionWrite_args(getLectureListPermissionWrite_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; + if (other.isSetToken()) { + this.token = other.token; } } @@ -18615,40 +20491,40 @@ public class Server { @Override public void clear() { - this.userID = null; + this.token = null; } - public String getUserID() { - return this.userID; + public String getToken() { + return this.token; } - public getLectureListPermissionWrite_args setUserID(String userID) { - this.userID = userID; + public getLectureListPermissionWrite_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case TOKEN: if (value == null) { - unsetUserID(); + unsetToken(); } else { - setUserID((String)value); + setToken((String)value); } break; @@ -18657,8 +20533,8 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); + case TOKEN: + return getToken(); } throw new IllegalStateException(); @@ -18671,8 +20547,8 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -18690,12 +20566,12 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.userID.equals(that.userID)) + if (!this.token.equals(that.token)) return false; } @@ -18715,12 +20591,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -18745,11 +20621,11 @@ public class Server { StringBuilder sb = new StringBuilder("getLectureListPermissionWrite_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.token); } first = false; sb.append(")"); @@ -18795,10 +20671,10 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -18818,9 +20694,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -18841,12 +20717,12 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getLectureListPermissionWrite_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(0); } oprot.writeBitSet(optionals, 1); - if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } } @@ -18855,8 +20731,8 @@ public class Server { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } } } @@ -19274,7 +21150,7 @@ public class Server { public static class getLectureListPermissionAdmin_args implements org.apache.thrift.TBase<getLectureListPermissionAdmin_args, getLectureListPermissionAdmin_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureListPermissionAdmin_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLectureListPermissionAdmin_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -19282,11 +21158,11 @@ public class Server { schemes.put(TupleScheme.class, new getLectureListPermissionAdmin_argsTupleSchemeFactory()); } - public String userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -19301,8 +21177,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; + case 1: // TOKEN + return TOKEN; default: return null; } @@ -19346,7 +21222,7 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureListPermissionAdmin_args.class, metaDataMap); @@ -19356,18 +21232,18 @@ public class Server { } public getLectureListPermissionAdmin_args( - String userID) + String token) { this(); - this.userID = userID; + this.token = token; } /** * Performs a deep copy on <i>other</i>. */ public getLectureListPermissionAdmin_args(getLectureListPermissionAdmin_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; + if (other.isSetToken()) { + this.token = other.token; } } @@ -19377,40 +21253,40 @@ public class Server { @Override public void clear() { - this.userID = null; + this.token = null; } - public String getUserID() { - return this.userID; + public String getToken() { + return this.token; } - public getLectureListPermissionAdmin_args setUserID(String userID) { - this.userID = userID; + public getLectureListPermissionAdmin_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case TOKEN: if (value == null) { - unsetUserID(); + unsetToken(); } else { - setUserID((String)value); + setToken((String)value); } break; @@ -19419,8 +21295,8 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); + case TOKEN: + return getToken(); } throw new IllegalStateException(); @@ -19433,8 +21309,8 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -19452,12 +21328,12 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.userID.equals(that.userID)) + if (!this.token.equals(that.token)) return false; } @@ -19477,12 +21353,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -19507,11 +21383,11 @@ public class Server { StringBuilder sb = new StringBuilder("getLectureListPermissionAdmin_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.token); } first = false; sb.append(")"); @@ -19557,10 +21433,10 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -19580,9 +21456,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -19603,12 +21479,12 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getLectureListPermissionAdmin_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(0); } oprot.writeBitSet(optionals, 1); - if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } } @@ -19617,8 +21493,8 @@ public class Server { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } } } @@ -20036,6 +21912,7 @@ public class Server { public static class getAllOS_args implements org.apache.thrift.TBase<getAllOS_args, getAllOS_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllOS_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllOS_args"); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -20043,10 +21920,11 @@ public class Server { schemes.put(TupleScheme.class, new getAllOS_argsTupleSchemeFactory()); } + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -20061,6 +21939,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // TOKEN + return TOKEN; default: return null; } @@ -20099,9 +21979,13 @@ public class Server { return _fieldName; } } + + // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllOS_args.class, metaDataMap); } @@ -20109,10 +21993,20 @@ public class Server { public getAllOS_args() { } + public getAllOS_args( + String token) + { + this(); + this.token = token; + } + /** * Performs a deep copy on <i>other</i>. */ public getAllOS_args(getAllOS_args other) { + if (other.isSetToken()) { + this.token = other.token; + } } public getAllOS_args deepCopy() { @@ -20121,15 +22015,51 @@ public class Server { @Override public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public getAllOS_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -20141,6 +22071,8 @@ public class Server { } switch (field) { + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -20158,6 +22090,15 @@ public class Server { if (that == null) return false; + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -20174,6 +22115,16 @@ public class Server { int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -20194,6 +22145,13 @@ public class Server { StringBuilder sb = new StringBuilder("getAllOS_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -20237,6 +22195,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -20252,6 +22218,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -20269,11 +22240,24 @@ public class Server { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getAllOS_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getAllOS_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -20685,6 +22669,7 @@ public class Server { public static class getAllUniversities_args implements org.apache.thrift.TBase<getAllUniversities_args, getAllUniversities_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllUniversities_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllUniversities_args"); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -20692,10 +22677,11 @@ public class Server { schemes.put(TupleScheme.class, new getAllUniversities_argsTupleSchemeFactory()); } + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -20710,6 +22696,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // TOKEN + return TOKEN; default: return null; } @@ -20748,9 +22736,13 @@ public class Server { return _fieldName; } } + + // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllUniversities_args.class, metaDataMap); } @@ -20758,10 +22750,20 @@ public class Server { public getAllUniversities_args() { } + public getAllUniversities_args( + String token) + { + this(); + this.token = token; + } + /** * Performs a deep copy on <i>other</i>. */ public getAllUniversities_args(getAllUniversities_args other) { + if (other.isSetToken()) { + this.token = other.token; + } } public getAllUniversities_args deepCopy() { @@ -20770,15 +22772,51 @@ public class Server { @Override public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public getAllUniversities_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -20790,6 +22828,8 @@ public class Server { } switch (field) { + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -20807,6 +22847,15 @@ public class Server { if (that == null) return false; + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -20823,6 +22872,16 @@ public class Server { int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -20843,6 +22902,13 @@ public class Server { StringBuilder sb = new StringBuilder("getAllUniversities_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -20886,6 +22952,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -20901,6 +22975,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -20918,11 +22997,24 @@ public class Server { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getAllUniversities_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getAllUniversities_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -21336,6 +23428,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -21345,11 +23438,13 @@ public class Server { public String Vorname; // required public String Nachname; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { VORNAME((short)1, "Vorname"), - NACHNAME((short)2, "Nachname"); + NACHNAME((short)2, "Nachname"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -21368,6 +23463,8 @@ public class Server { return VORNAME; case 2: // NACHNAME return NACHNAME; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -21415,6 +23512,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.NACHNAME, new org.apache.thrift.meta_data.FieldMetaData("Nachname", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPersonData_args.class, metaDataMap); } @@ -21424,11 +23523,13 @@ public class Server { public getPersonData_args( String Vorname, - String Nachname) + String Nachname, + String token) { this(); this.Vorname = Vorname; this.Nachname = Nachname; + this.token = token; } /** @@ -21441,6 +23542,9 @@ public class Server { if (other.isSetNachname()) { this.Nachname = other.Nachname; } + if (other.isSetToken()) { + this.token = other.token; + } } public getPersonData_args deepCopy() { @@ -21451,6 +23555,7 @@ public class Server { public void clear() { this.Vorname = null; this.Nachname = null; + this.token = null; } public String getVorname() { @@ -21501,6 +23606,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getPersonData_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case VORNAME: @@ -21519,6 +23648,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -21530,6 +23667,9 @@ public class Server { case NACHNAME: return getNachname(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -21545,6 +23685,8 @@ public class Server { return isSetVorname(); case NACHNAME: return isSetNachname(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -21580,6 +23722,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -21616,6 +23767,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -21651,6 +23812,14 @@ public class Server { sb.append(this.Nachname); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -21710,6 +23879,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -21735,6 +23912,11 @@ public class Server { oprot.writeString(struct.Nachname); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -21759,19 +23941,25 @@ public class Server { if (struct.isSetNachname()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetVorname()) { oprot.writeString(struct.Vorname); } if (struct.isSetNachname()) { oprot.writeString(struct.Nachname); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPersonData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.Vorname = iprot.readString(); struct.setVornameIsSet(true); @@ -21780,6 +23968,10 @@ public class Server { struct.Nachname = iprot.readString(); struct.setNachnameIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -22195,6 +24387,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getItemOwner_args"); private static final org.apache.thrift.protocol.TField ITEM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("itemID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -22203,10 +24396,12 @@ public class Server { } public String itemID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ITEM_ID((short)1, "itemID"); + ITEM_ID((short)1, "itemID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -22223,6 +24418,8 @@ public class Server { switch(fieldId) { case 1: // ITEM_ID return ITEM_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -22268,6 +24465,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.ITEM_ID, new org.apache.thrift.meta_data.FieldMetaData("itemID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getItemOwner_args.class, metaDataMap); } @@ -22276,10 +24475,12 @@ public class Server { } public getItemOwner_args( - String itemID) + String itemID, + String token) { this(); this.itemID = itemID; + this.token = token; } /** @@ -22289,6 +24490,9 @@ public class Server { if (other.isSetItemID()) { this.itemID = other.itemID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getItemOwner_args deepCopy() { @@ -22298,6 +24502,7 @@ public class Server { @Override public void clear() { this.itemID = null; + this.token = null; } public String getItemID() { @@ -22324,6 +24529,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getItemOwner_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ITEM_ID: @@ -22334,6 +24563,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -22342,6 +24579,9 @@ public class Server { case ITEM_ID: return getItemID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -22355,6 +24595,8 @@ public class Server { switch (field) { case ITEM_ID: return isSetItemID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -22381,6 +24623,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -22407,6 +24658,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -22434,6 +24695,14 @@ public class Server { sb.append(this.itemID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -22485,6 +24754,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -22505,6 +24782,11 @@ public class Server { oprot.writeString(struct.itemID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -22526,20 +24808,30 @@ public class Server { if (struct.isSetItemID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetItemID()) { oprot.writeString(struct.itemID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getItemOwner_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.itemID = iprot.readString(); struct.setItemIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -22954,11 +25246,9 @@ public class Server { public static class setPerson_args implements org.apache.thrift.TBase<setPerson_args, setPerson_args._Fields>, java.io.Serializable, Cloneable, Comparable<setPerson_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setPerson_args"); - 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)1); - 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)2); - 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)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 INSTITUTION_FIELD_DESC = new org.apache.thrift.protocol.TField("Institution", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField INSTITUTION_FIELD_DESC = new org.apache.thrift.protocol.TField("institution", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -22966,19 +25256,15 @@ public class Server { schemes.put(TupleScheme.class, new setPerson_argsTupleSchemeFactory()); } - public String login; // required - public String lastname; // required - public String firstname; // required - public String mail; // required - public String Institution; // required + public String userID; // required + public String token; // required + public String institution; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - LOGIN((short)1, "login"), - LASTNAME((short)2, "lastname"), - FIRSTNAME((short)3, "firstname"), - MAIL((short)4, "mail"), - INSTITUTION((short)5, "Institution"); + USER_ID((short)1, "userID"), + TOKEN((short)2, "token"), + INSTITUTION((short)3, "institution"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -22993,15 +25279,11 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // LOGIN - return LOGIN; - case 2: // LASTNAME - return LASTNAME; - case 3: // FIRSTNAME - return FIRSTNAME; - case 4: // MAIL - return MAIL; - case 5: // INSTITUTION + case 1: // USER_ID + return USER_ID; + case 2: // TOKEN + return TOKEN; + case 3: // INSTITUTION return INSTITUTION; default: return null; @@ -23046,15 +25328,11 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.LOGIN, new org.apache.thrift.meta_data.FieldMetaData("login", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LASTNAME, new org.apache.thrift.meta_data.FieldMetaData("lastname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRSTNAME, new org.apache.thrift.meta_data.FieldMetaData("firstname", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("mail", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.INSTITUTION, new org.apache.thrift.meta_data.FieldMetaData("Institution", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.INSTITUTION, new org.apache.thrift.meta_data.FieldMetaData("institution", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setPerson_args.class, metaDataMap); @@ -23064,38 +25342,28 @@ public class Server { } public setPerson_args( - String login, - String lastname, - String firstname, - String mail, - String Institution) + String userID, + String token, + String institution) { this(); - this.login = login; - this.lastname = lastname; - this.firstname = firstname; - this.mail = mail; - this.Institution = Institution; + this.userID = userID; + this.token = token; + this.institution = institution; } /** * Performs a deep copy on <i>other</i>. */ public setPerson_args(setPerson_args other) { - if (other.isSetLogin()) { - this.login = other.login; - } - if (other.isSetLastname()) { - this.lastname = other.lastname; - } - if (other.isSetFirstname()) { - this.firstname = other.firstname; + if (other.isSetUserID()) { + this.userID = other.userID; } - if (other.isSetMail()) { - this.mail = other.mail; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetInstitution()) { - this.Institution = other.Institution; + this.institution = other.institution; } } @@ -23105,164 +25373,98 @@ public class Server { @Override public void clear() { - this.login = null; - this.lastname = null; - this.firstname = null; - this.mail = null; - this.Institution = null; - } - - public String getLogin() { - return this.login; - } - - public setPerson_args setLogin(String login) { - this.login = login; - return this; - } - - public void unsetLogin() { - this.login = null; - } - - /** Returns true if field login is set (has been assigned a value) and false otherwise */ - public boolean isSetLogin() { - return this.login != null; - } - - public void setLoginIsSet(boolean value) { - if (!value) { - this.login = null; - } - } - - public String getLastname() { - return this.lastname; - } - - public setPerson_args setLastname(String lastname) { - this.lastname = lastname; - return this; - } - - public void unsetLastname() { - this.lastname = null; - } - - /** Returns true if field lastname is set (has been assigned a value) and false otherwise */ - public boolean isSetLastname() { - return this.lastname != null; - } - - public void setLastnameIsSet(boolean value) { - if (!value) { - this.lastname = null; - } + this.userID = null; + this.token = null; + this.institution = null; } - public String getFirstname() { - return this.firstname; + public String getUserID() { + return this.userID; } - public setPerson_args setFirstname(String firstname) { - this.firstname = firstname; + public setPerson_args setUserID(String userID) { + this.userID = userID; return this; } - public void unsetFirstname() { - this.firstname = null; + public void unsetUserID() { + this.userID = null; } - /** Returns true if field firstname is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstname() { - return this.firstname != null; + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; } - public void setFirstnameIsSet(boolean value) { + public void setUserIDIsSet(boolean value) { if (!value) { - this.firstname = null; + this.userID = null; } } - public String getMail() { - return this.mail; + public String getToken() { + return this.token; } - public setPerson_args setMail(String mail) { - this.mail = mail; + public setPerson_args setToken(String token) { + this.token = token; return this; } - public void unsetMail() { - this.mail = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.mail != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setMailIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.mail = null; + this.token = null; } } public String getInstitution() { - return this.Institution; + return this.institution; } - public setPerson_args setInstitution(String Institution) { - this.Institution = Institution; + public setPerson_args setInstitution(String institution) { + this.institution = institution; return this; } public void unsetInstitution() { - this.Institution = null; + this.institution = null; } - /** Returns true if field Institution is set (has been assigned a value) and false otherwise */ + /** Returns true if field institution is set (has been assigned a value) and false otherwise */ public boolean isSetInstitution() { - return this.Institution != null; + return this.institution != null; } public void setInstitutionIsSet(boolean value) { if (!value) { - this.Institution = null; + this.institution = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case LOGIN: - if (value == null) { - unsetLogin(); - } else { - setLogin((String)value); - } - break; - - case LASTNAME: - if (value == null) { - unsetLastname(); - } else { - setLastname((String)value); - } - break; - - case FIRSTNAME: + case USER_ID: if (value == null) { - unsetFirstname(); + unsetUserID(); } else { - setFirstname((String)value); + setUserID((String)value); } break; - case MAIL: + case TOKEN: if (value == null) { - unsetMail(); + unsetToken(); } else { - setMail((String)value); + setToken((String)value); } break; @@ -23279,17 +25481,11 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case LOGIN: - return getLogin(); - - case LASTNAME: - return getLastname(); - - case FIRSTNAME: - return getFirstname(); + case USER_ID: + return getUserID(); - case MAIL: - return getMail(); + case TOKEN: + return getToken(); case INSTITUTION: return getInstitution(); @@ -23305,14 +25501,10 @@ public class Server { } switch (field) { - case LOGIN: - return isSetLogin(); - case LASTNAME: - return isSetLastname(); - case FIRSTNAME: - return isSetFirstname(); - case MAIL: - return isSetMail(); + case USER_ID: + return isSetUserID(); + case TOKEN: + return isSetToken(); case INSTITUTION: return isSetInstitution(); } @@ -23332,48 +25524,30 @@ public class Server { if (that == null) return false; - boolean this_present_login = true && this.isSetLogin(); - boolean that_present_login = true && that.isSetLogin(); - if (this_present_login || that_present_login) { - if (!(this_present_login && that_present_login)) - return false; - if (!this.login.equals(that.login)) - return false; - } - - boolean this_present_lastname = true && this.isSetLastname(); - boolean that_present_lastname = true && that.isSetLastname(); - if (this_present_lastname || that_present_lastname) { - if (!(this_present_lastname && that_present_lastname)) - return false; - if (!this.lastname.equals(that.lastname)) - return false; - } - - boolean this_present_firstname = true && this.isSetFirstname(); - boolean that_present_firstname = true && that.isSetFirstname(); - if (this_present_firstname || that_present_firstname) { - if (!(this_present_firstname && that_present_firstname)) + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) return false; - if (!this.firstname.equals(that.firstname)) + if (!this.userID.equals(that.userID)) return false; } - boolean this_present_mail = true && this.isSetMail(); - boolean that_present_mail = true && that.isSetMail(); - if (this_present_mail || that_present_mail) { - if (!(this_present_mail && that_present_mail)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.mail.equals(that.mail)) + if (!this.token.equals(that.token)) return false; } - boolean this_present_Institution = true && this.isSetInstitution(); - boolean that_present_Institution = true && that.isSetInstitution(); - if (this_present_Institution || that_present_Institution) { - if (!(this_present_Institution && that_present_Institution)) + boolean this_present_institution = true && this.isSetInstitution(); + boolean that_present_institution = true && that.isSetInstitution(); + if (this_present_institution || that_present_institution) { + if (!(this_present_institution && that_present_institution)) return false; - if (!this.Institution.equals(that.Institution)) + if (!this.institution.equals(that.institution)) return false; } @@ -23393,42 +25567,22 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLogin()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastname()).compareTo(other.isSetLastname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastname, other.lastname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetFirstname()).compareTo(other.isSetFirstname()); + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); if (lastComparison != 0) { return lastComparison; } - if (isSetFirstname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstname, other.firstname); + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mail, other.mail); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -23438,7 +25592,7 @@ public class Server { return lastComparison; } if (isSetInstitution()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.Institution, other.Institution); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.institution, other.institution); if (lastComparison != 0) { return lastComparison; } @@ -23463,43 +25617,27 @@ public class Server { StringBuilder sb = new StringBuilder("setPerson_args("); boolean first = true; - sb.append("login:"); - if (this.login == null) { - sb.append("null"); - } else { - sb.append(this.login); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastname:"); - if (this.lastname == null) { - sb.append("null"); - } else { - sb.append(this.lastname); - } - first = false; - if (!first) sb.append(", "); - sb.append("firstname:"); - if (this.firstname == null) { + sb.append("userID:"); + if (this.userID == null) { sb.append("null"); } else { - sb.append(this.firstname); + sb.append(this.userID); } first = false; if (!first) sb.append(", "); - sb.append("mail:"); - if (this.mail == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.mail); + sb.append(this.token); } first = false; if (!first) sb.append(", "); - sb.append("Institution:"); - if (this.Institution == null) { + sb.append("institution:"); + if (this.institution == null) { sb.append("null"); } else { - sb.append(this.Institution); + sb.append(this.institution); } first = false; sb.append(")"); @@ -23545,41 +25683,25 @@ public class Server { break; } switch (schemeField.id) { - case 1: // LOGIN - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.login = iprot.readString(); - struct.setLoginIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // LASTNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // FIRSTNAME + case 1: // USER_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // MAIL + case 2: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // INSTITUTION + case 3: // INSTITUTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.Institution = iprot.readString(); + struct.institution = iprot.readString(); struct.setInstitutionIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -23600,29 +25722,19 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.login != null) { - oprot.writeFieldBegin(LOGIN_FIELD_DESC); - oprot.writeString(struct.login); - oprot.writeFieldEnd(); - } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); - oprot.writeFieldEnd(); - } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); oprot.writeFieldEnd(); } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } - if (struct.Institution != null) { + if (struct.institution != null) { oprot.writeFieldBegin(INSTITUTION_FIELD_DESC); - oprot.writeString(struct.Institution); + oprot.writeString(struct.institution); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -23643,61 +25755,41 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, setPerson_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetLogin()) { + if (struct.isSetUserID()) { optionals.set(0); } - if (struct.isSetLastname()) { + if (struct.isSetToken()) { optionals.set(1); } - if (struct.isSetFirstname()) { - optionals.set(2); - } - if (struct.isSetMail()) { - optionals.set(3); - } if (struct.isSetInstitution()) { - optionals.set(4); - } - oprot.writeBitSet(optionals, 5); - if (struct.isSetLogin()) { - oprot.writeString(struct.login); - } - if (struct.isSetLastname()) { - oprot.writeString(struct.lastname); + optionals.set(2); } - if (struct.isSetFirstname()) { - oprot.writeString(struct.firstname); + oprot.writeBitSet(optionals, 3); + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); } - if (struct.isSetMail()) { - oprot.writeString(struct.mail); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetInstitution()) { - oprot.writeString(struct.Institution); + oprot.writeString(struct.institution); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, setPerson_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.login = iprot.readString(); - struct.setLoginIsSet(true); + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } if (incoming.get(1)) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(2)) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } - if (incoming.get(3)) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(4)) { - struct.Institution = iprot.readString(); + struct.institution = iprot.readString(); struct.setInstitutionIsSet(true); } } @@ -23961,14 +26053,11 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)8); 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 LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureID", org.apache.thrift.protocol.TType.STRING, (short)16); + 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)17); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -23983,14 +26072,11 @@ public class Server { public String endDate; // required public boolean isActive; // required public String imagename; // required - public String login; // required - public String firstname; // required - public String lastname; // required - public String university; // required - public String Mail; // required + public String token; // required public String Tel; // required public String Fak; // required public String lectureID; // required + public String university; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -24001,14 +26087,11 @@ public class Server { 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"), + TOKEN((short)8, "token"), TEL((short)13, "Tel"), FAK((short)14, "Fak"), - LECTURE_ID((short)16, "lectureID"); + LECTURE_ID((short)16, "lectureID"), + UNIVERSITY((short)17, "university"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -24037,22 +26120,16 @@ public class Server { return IS_ACTIVE; case 7: // IMAGENAME return IMAGENAME; - case 8: // LOGIN - return LOGIN; - case 9: // FIRSTNAME - return FIRSTNAME; - case 10: // LASTNAME - return LASTNAME; - case 11: // UNIVERSITY - return UNIVERSITY; - case 12: // MAIL - return MAIL; + case 8: // TOKEN + return TOKEN; case 13: // TEL return TEL; case 14: // FAK return FAK; case 16: // LECTURE_ID return LECTURE_ID; + case 17: // UNIVERSITY + return UNIVERSITY; default: return null; } @@ -24112,15 +26189,7 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.IMAGENAME, new org.apache.thrift.meta_data.FieldMetaData("imagename", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LOGIN, new org.apache.thrift.meta_data.FieldMetaData("login", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRSTNAME, new org.apache.thrift.meta_data.FieldMetaData("firstname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LASTNAME, new org.apache.thrift.meta_data.FieldMetaData("lastname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("Mail", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TEL, new org.apache.thrift.meta_data.FieldMetaData("Tel", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -24128,6 +26197,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeLecturedata_args.class, metaDataMap); } @@ -24143,14 +26214,11 @@ public class Server { String endDate, boolean isActive, String imagename, - String login, - String firstname, - String lastname, - String university, - String Mail, + String token, String Tel, String Fak, - String lectureID) + String lectureID, + String university) { this(); this.name = name; @@ -24161,14 +26229,11 @@ public class Server { this.isActive = isActive; setIsActiveIsSet(true); this.imagename = imagename; - this.login = login; - this.firstname = firstname; - this.lastname = lastname; - this.university = university; - this.Mail = Mail; + this.token = token; this.Tel = Tel; this.Fak = Fak; this.lectureID = lectureID; + this.university = university; } /** @@ -24195,20 +26260,8 @@ public class Server { if (other.isSetImagename()) { this.imagename = other.imagename; } - if (other.isSetLogin()) { - this.login = other.login; - } - if (other.isSetFirstname()) { - this.firstname = other.firstname; - } - if (other.isSetLastname()) { - this.lastname = other.lastname; - } - if (other.isSetUniversity()) { - this.university = other.university; - } - if (other.isSetMail()) { - this.Mail = other.Mail; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetTel()) { this.Tel = other.Tel; @@ -24219,6 +26272,9 @@ public class Server { if (other.isSetLectureID()) { this.lectureID = other.lectureID; } + if (other.isSetUniversity()) { + this.university = other.university; + } } public writeLecturedata_args deepCopy() { @@ -24235,14 +26291,11 @@ public class Server { setIsActiveIsSet(false); this.isActive = false; this.imagename = null; - this.login = null; - this.firstname = null; - this.lastname = null; - this.university = null; - this.Mail = null; + this.token = null; this.Tel = null; this.Fak = null; this.lectureID = null; + this.university = null; } public String getName() { @@ -24412,123 +26465,27 @@ public class Server { } } - public String getLogin() { - return this.login; - } - - public writeLecturedata_args setLogin(String login) { - this.login = login; - return this; - } - - public void unsetLogin() { - this.login = null; - } - - /** Returns true if field login is set (has been assigned a value) and false otherwise */ - public boolean isSetLogin() { - return this.login != null; - } - - public void setLoginIsSet(boolean value) { - if (!value) { - this.login = null; - } - } - - public String getFirstname() { - return this.firstname; - } - - public writeLecturedata_args setFirstname(String firstname) { - this.firstname = firstname; - return this; - } - - public void unsetFirstname() { - this.firstname = null; - } - - /** Returns true if field firstname is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstname() { - return this.firstname != null; - } - - public void setFirstnameIsSet(boolean value) { - if (!value) { - this.firstname = null; - } - } - - public String getLastname() { - return this.lastname; - } - - public writeLecturedata_args setLastname(String lastname) { - this.lastname = lastname; - return this; - } - - public void unsetLastname() { - this.lastname = null; - } - - /** Returns true if field lastname is set (has been assigned a value) and false otherwise */ - public boolean isSetLastname() { - return this.lastname != null; - } - - public void setLastnameIsSet(boolean value) { - if (!value) { - this.lastname = null; - } - } - - public String getUniversity() { - return this.university; - } - - public writeLecturedata_args setUniversity(String university) { - this.university = university; - return this; - } - - public void unsetUniversity() { - this.university = null; - } - - /** Returns true if field university is set (has been assigned a value) and false otherwise */ - public boolean isSetUniversity() { - return this.university != null; - } - - public void setUniversityIsSet(boolean value) { - if (!value) { - this.university = null; - } - } - - public String getMail() { - return this.Mail; + public String getToken() { + return this.token; } - public writeLecturedata_args setMail(String Mail) { - this.Mail = Mail; + public writeLecturedata_args setToken(String token) { + this.token = token; return this; } - public void unsetMail() { - this.Mail = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field Mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.Mail != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setMailIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.Mail = null; + this.token = null; } } @@ -24604,6 +26561,30 @@ public class Server { } } + public String getUniversity() { + return this.university; + } + + public writeLecturedata_args setUniversity(String university) { + this.university = university; + return this; + } + + public void unsetUniversity() { + this.university = null; + } + + /** Returns true if field university is set (has been assigned a value) and false otherwise */ + public boolean isSetUniversity() { + return this.university != null; + } + + public void setUniversityIsSet(boolean value) { + if (!value) { + this.university = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAME: @@ -24662,43 +26643,11 @@ public class Server { } break; - case LOGIN: - if (value == null) { - unsetLogin(); - } else { - setLogin((String)value); - } - break; - - case FIRSTNAME: - if (value == null) { - unsetFirstname(); - } else { - setFirstname((String)value); - } - break; - - case LASTNAME: - if (value == null) { - unsetLastname(); - } else { - setLastname((String)value); - } - break; - - case UNIVERSITY: - if (value == null) { - unsetUniversity(); - } else { - setUniversity((String)value); - } - break; - - case MAIL: + case TOKEN: if (value == null) { - unsetMail(); + unsetToken(); } else { - setMail((String)value); + setToken((String)value); } break; @@ -24726,6 +26675,14 @@ public class Server { } break; + case UNIVERSITY: + if (value == null) { + unsetUniversity(); + } else { + setUniversity((String)value); + } + break; + } } @@ -24752,20 +26709,8 @@ public class Server { case IMAGENAME: return getImagename(); - case LOGIN: - return getLogin(); - - case FIRSTNAME: - return getFirstname(); - - case LASTNAME: - return getLastname(); - - case UNIVERSITY: - return getUniversity(); - - case MAIL: - return getMail(); + case TOKEN: + return getToken(); case TEL: return getTel(); @@ -24776,6 +26721,9 @@ public class Server { case LECTURE_ID: return getLectureID(); + case UNIVERSITY: + return getUniversity(); + } throw new IllegalStateException(); } @@ -24801,22 +26749,16 @@ public class Server { return isSetIsActive(); case IMAGENAME: return isSetImagename(); - case LOGIN: - return isSetLogin(); - case FIRSTNAME: - return isSetFirstname(); - case LASTNAME: - return isSetLastname(); - case UNIVERSITY: - return isSetUniversity(); - case MAIL: - return isSetMail(); + case TOKEN: + return isSetToken(); case TEL: return isSetTel(); case FAK: return isSetFak(); case LECTURE_ID: return isSetLectureID(); + case UNIVERSITY: + return isSetUniversity(); } throw new IllegalStateException(); } @@ -24897,48 +26839,12 @@ public class Server { return false; } - boolean this_present_login = true && this.isSetLogin(); - boolean that_present_login = true && that.isSetLogin(); - if (this_present_login || that_present_login) { - if (!(this_present_login && that_present_login)) - return false; - if (!this.login.equals(that.login)) - return false; - } - - boolean this_present_firstname = true && this.isSetFirstname(); - boolean that_present_firstname = true && that.isSetFirstname(); - if (this_present_firstname || that_present_firstname) { - if (!(this_present_firstname && that_present_firstname)) - return false; - if (!this.firstname.equals(that.firstname)) - return false; - } - - boolean this_present_lastname = true && this.isSetLastname(); - boolean that_present_lastname = true && that.isSetLastname(); - if (this_present_lastname || that_present_lastname) { - if (!(this_present_lastname && that_present_lastname)) - return false; - if (!this.lastname.equals(that.lastname)) - return false; - } - - boolean this_present_university = true && this.isSetUniversity(); - boolean that_present_university = true && that.isSetUniversity(); - if (this_present_university || that_present_university) { - if (!(this_present_university && that_present_university)) - return false; - if (!this.university.equals(that.university)) - return false; - } - - boolean this_present_Mail = true && this.isSetMail(); - boolean that_present_Mail = true && that.isSetMail(); - if (this_present_Mail || that_present_Mail) { - if (!(this_present_Mail && that_present_Mail)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.Mail.equals(that.Mail)) + if (!this.token.equals(that.token)) return false; } @@ -24969,6 +26875,15 @@ public class Server { return false; } + boolean this_present_university = true && this.isSetUniversity(); + boolean that_present_university = true && that.isSetUniversity(); + if (this_present_university || that_present_university) { + if (!(this_present_university && that_present_university)) + return false; + if (!this.university.equals(that.university)) + return false; + } + return true; } @@ -25055,52 +26970,12 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLogin()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetFirstname()).compareTo(other.isSetFirstname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetFirstname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstname, other.firstname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastname()).compareTo(other.isSetLastname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastname, other.lastname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetUniversity()).compareTo(other.isSetUniversity()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUniversity()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.university, other.university); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.Mail, other.Mail); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -25135,6 +27010,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetUniversity()).compareTo(other.isSetUniversity()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUniversity()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.university, other.university); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -25207,43 +27092,11 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("login:"); - if (this.login == null) { - sb.append("null"); - } else { - sb.append(this.login); - } - first = false; - if (!first) sb.append(", "); - sb.append("firstname:"); - if (this.firstname == null) { - sb.append("null"); - } else { - sb.append(this.firstname); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastname:"); - if (this.lastname == null) { - sb.append("null"); - } else { - sb.append(this.lastname); - } - first = false; - if (!first) sb.append(", "); - sb.append("university:"); - if (this.university == null) { - sb.append("null"); - } else { - sb.append(this.university); - } - first = false; - if (!first) sb.append(", "); - sb.append("Mail:"); - if (this.Mail == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.Mail); + sb.append(this.token); } first = false; if (!first) sb.append(", "); @@ -25270,6 +27123,14 @@ public class Server { sb.append(this.lectureID); } first = false; + if (!first) sb.append(", "); + sb.append("university:"); + if (this.university == null) { + sb.append("null"); + } else { + sb.append(this.university); + } + first = false; sb.append(")"); return sb.toString(); } @@ -25371,42 +27232,10 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // LOGIN - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.login = iprot.readString(); - struct.setLoginIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 9: // FIRSTNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 10: // LASTNAME + case 8: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 11: // UNIVERSITY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.university = iprot.readString(); - struct.setUniversityIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 12: // MAIL - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.Mail = iprot.readString(); - struct.setMailIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -25435,6 +27264,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 17: // UNIVERSITY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.university = iprot.readString(); + struct.setUniversityIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -25483,29 +27320,9 @@ public class Server { oprot.writeString(struct.imagename); oprot.writeFieldEnd(); } - if (struct.login != null) { - oprot.writeFieldBegin(LOGIN_FIELD_DESC); - oprot.writeString(struct.login); - oprot.writeFieldEnd(); - } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); - oprot.writeFieldEnd(); - } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); - oprot.writeFieldEnd(); - } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); - oprot.writeFieldEnd(); - } - if (struct.Mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.Mail); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } if (struct.Tel != null) { @@ -25523,6 +27340,11 @@ public class Server { oprot.writeString(struct.lectureID); oprot.writeFieldEnd(); } + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -25562,31 +27384,22 @@ public class Server { if (struct.isSetImagename()) { optionals.set(6); } - if (struct.isSetLogin()) { + if (struct.isSetToken()) { optionals.set(7); } - if (struct.isSetFirstname()) { + if (struct.isSetTel()) { optionals.set(8); } - if (struct.isSetLastname()) { + if (struct.isSetFak()) { optionals.set(9); } - if (struct.isSetUniversity()) { + if (struct.isSetLectureID()) { optionals.set(10); } - if (struct.isSetMail()) { + if (struct.isSetUniversity()) { optionals.set(11); } - if (struct.isSetTel()) { - optionals.set(12); - } - if (struct.isSetFak()) { - optionals.set(13); - } - if (struct.isSetLectureID()) { - optionals.set(14); - } - oprot.writeBitSet(optionals, 15); + oprot.writeBitSet(optionals, 12); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -25608,20 +27421,8 @@ public class Server { if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } - if (struct.isSetLogin()) { - oprot.writeString(struct.login); - } - if (struct.isSetFirstname()) { - oprot.writeString(struct.firstname); - } - if (struct.isSetLastname()) { - oprot.writeString(struct.lastname); - } - if (struct.isSetUniversity()) { - oprot.writeString(struct.university); - } - if (struct.isSetMail()) { - oprot.writeString(struct.Mail); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetTel()) { oprot.writeString(struct.Tel); @@ -25632,12 +27433,15 @@ public class Server { if (struct.isSetLectureID()) { oprot.writeString(struct.lectureID); } + if (struct.isSetUniversity()) { + oprot.writeString(struct.university); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeLecturedata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(15); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -25667,37 +27471,25 @@ public class Server { struct.setImagenameIsSet(true); } if (incoming.get(7)) { - struct.login = iprot.readString(); - struct.setLoginIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(8)) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } - if (incoming.get(9)) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } - if (incoming.get(10)) { - struct.university = iprot.readString(); - struct.setUniversityIsSet(true); - } - if (incoming.get(11)) { - struct.Mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(12)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(13)) { + if (incoming.get(9)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } - if (incoming.get(14)) { + if (incoming.get(10)) { struct.lectureID = iprot.readString(); struct.setLectureIDIsSet(true); } + if (incoming.get(11)) { + struct.university = iprot.readString(); + struct.setUniversityIsSet(true); + } } } @@ -26061,6 +27853,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -26069,10 +27862,12 @@ public class Server { } public String file; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - FILE((short)1, "file"); + FILE((short)1, "file"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -26089,6 +27884,8 @@ public class Server { switch(fieldId) { case 1: // FILE return FILE; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -26134,6 +27931,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.FILE, new org.apache.thrift.meta_data.FieldMetaData("file", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startFileCopy_args.class, metaDataMap); } @@ -26142,10 +27941,12 @@ public class Server { } public startFileCopy_args( - String file) + String file, + String token) { this(); this.file = file; + this.token = token; } /** @@ -26155,6 +27956,9 @@ public class Server { if (other.isSetFile()) { this.file = other.file; } + if (other.isSetToken()) { + this.token = other.token; + } } public startFileCopy_args deepCopy() { @@ -26164,6 +27968,7 @@ public class Server { @Override public void clear() { this.file = null; + this.token = null; } public String getFile() { @@ -26190,6 +27995,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public startFileCopy_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case FILE: @@ -26200,6 +28029,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -26208,6 +28045,9 @@ public class Server { case FILE: return getFile(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -26221,6 +28061,8 @@ public class Server { switch (field) { case FILE: return isSetFile(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -26247,6 +28089,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -26273,6 +28124,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -26300,6 +28161,14 @@ public class Server { sb.append(this.file); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -26351,6 +28220,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -26371,6 +28248,11 @@ public class Server { oprot.writeString(struct.file); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -26392,20 +28274,30 @@ public class Server { if (struct.isSetFile()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetFile()) { oprot.writeString(struct.file); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, startFileCopy_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.file = iprot.readString(); struct.setFileIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -26770,6 +28662,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -26779,11 +28672,13 @@ public class Server { public String imageid; // required public String imageversion; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { IMAGEID((short)1, "imageid"), - IMAGEVERSION((short)2, "imageversion"); + IMAGEVERSION((short)2, "imageversion"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -26802,6 +28697,8 @@ public class Server { return IMAGEID; case 2: // IMAGEVERSION return IMAGEVERSION; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -26849,6 +28746,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.IMAGEVERSION, new org.apache.thrift.meta_data.FieldMetaData("imageversion", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_args.class, metaDataMap); } @@ -26858,11 +28757,13 @@ public class Server { public getImageData_args( String imageid, - String imageversion) + String imageversion, + String token) { this(); this.imageid = imageid; this.imageversion = imageversion; + this.token = token; } /** @@ -26875,6 +28776,9 @@ public class Server { if (other.isSetImageversion()) { this.imageversion = other.imageversion; } + if (other.isSetToken()) { + this.token = other.token; + } } public getImageData_args deepCopy() { @@ -26885,6 +28789,7 @@ public class Server { public void clear() { this.imageid = null; this.imageversion = null; + this.token = null; } public String getImageid() { @@ -26935,6 +28840,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getImageData_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGEID: @@ -26953,6 +28882,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -26964,6 +28901,9 @@ public class Server { case IMAGEVERSION: return getImageversion(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -26979,6 +28919,8 @@ public class Server { return isSetImageid(); case IMAGEVERSION: return isSetImageversion(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -27014,6 +28956,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -27050,6 +29001,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -27085,6 +29046,14 @@ public class Server { sb.append(this.imageversion); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -27144,6 +29113,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -27169,6 +29146,11 @@ public class Server { oprot.writeString(struct.imageversion); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -27193,19 +29175,25 @@ public class Server { if (struct.isSetImageversion()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetImageid()) { oprot.writeString(struct.imageid); } if (struct.isSetImageversion()) { oprot.writeString(struct.imageversion); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.imageid = iprot.readString(); struct.setImageidIsSet(true); @@ -27214,6 +29202,10 @@ public class Server { struct.imageversion = iprot.readString(); struct.setImageversionIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -27629,6 +29621,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -27637,10 +29630,12 @@ public class Server { } public String lectureid; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - LECTUREID((short)1, "lectureid"); + LECTUREID((short)1, "lectureid"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -27657,6 +29652,8 @@ public class Server { switch(fieldId) { case 1: // LECTUREID return LECTUREID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -27702,6 +29699,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.LECTUREID, new org.apache.thrift.meta_data.FieldMetaData("lectureid", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureData_args.class, metaDataMap); } @@ -27710,10 +29709,12 @@ public class Server { } public getLectureData_args( - String lectureid) + String lectureid, + String token) { this(); this.lectureid = lectureid; + this.token = token; } /** @@ -27723,6 +29724,9 @@ public class Server { if (other.isSetLectureid()) { this.lectureid = other.lectureid; } + if (other.isSetToken()) { + this.token = other.token; + } } public getLectureData_args deepCopy() { @@ -27732,6 +29736,7 @@ public class Server { @Override public void clear() { this.lectureid = null; + this.token = null; } public String getLectureid() { @@ -27758,6 +29763,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getLectureData_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case LECTUREID: @@ -27768,6 +29797,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -27776,6 +29813,9 @@ public class Server { case LECTUREID: return getLectureid(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -27789,6 +29829,8 @@ public class Server { switch (field) { case LECTUREID: return isSetLectureid(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -27815,6 +29857,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -27841,6 +29892,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -27868,6 +29929,14 @@ public class Server { sb.append(this.lectureid); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -27919,6 +29988,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -27939,6 +30016,11 @@ public class Server { oprot.writeString(struct.lectureid); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -27960,20 +30042,30 @@ public class Server { if (struct.isSetLectureid()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetLectureid()) { oprot.writeString(struct.lectureid); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getLectureData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.lectureid = iprot.readString(); struct.setLectureidIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -28402,6 +30494,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)15); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -28423,6 +30516,7 @@ public class Server { public long filesize; // required public long shareMode; // required public String os; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -28439,7 +30533,8 @@ public class Server { IS_TEMPLATE((short)11, "isTemplate"), FILESIZE((short)12, "filesize"), SHARE_MODE((short)13, "shareMode"), - OS((short)14, "os"); + OS((short)14, "os"), + TOKEN((short)15, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -28482,6 +30577,8 @@ public class Server { return SHARE_MODE; case 14: // OS return OS; + case 15: // TOKEN + return TOKEN; default: return null; } @@ -28561,6 +30658,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); tmpMap.put(_Fields.OS, new org.apache.thrift.meta_data.FieldMetaData("os", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageData_args.class, metaDataMap); } @@ -28582,7 +30681,8 @@ public class Server { boolean isTemplate, long filesize, long shareMode, - String os) + String os, + String token) { this(); this.name = name; @@ -28606,6 +30706,7 @@ public class Server { this.shareMode = shareMode; setShareModeIsSet(true); this.os = os; + this.token = token; } /** @@ -28641,6 +30742,9 @@ public class Server { if (other.isSetOs()) { this.os = other.os; } + if (other.isSetToken()) { + this.token = other.token; + } } public updateImageData_args deepCopy() { @@ -28670,6 +30774,7 @@ public class Server { setShareModeIsSet(false); this.shareMode = 0; this.os = null; + this.token = null; } public String getName() { @@ -29001,6 +31106,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public updateImageData_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAME: @@ -29115,6 +31244,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -29162,6 +31299,9 @@ public class Server { case OS: return getOs(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -29201,6 +31341,8 @@ public class Server { return isSetShareMode(); case OS: return isSetOs(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -29344,6 +31486,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -29500,6 +31651,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -29603,6 +31764,14 @@ public class Server { sb.append(this.os); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -29760,6 +31929,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 15: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -29831,6 +32008,11 @@ public class Server { oprot.writeString(struct.os); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -29891,7 +32073,10 @@ public class Server { if (struct.isSetOs()) { optionals.set(13); } - oprot.writeBitSet(optionals, 14); + if (struct.isSetToken()) { + optionals.set(14); + } + oprot.writeBitSet(optionals, 15); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -29934,12 +32119,15 @@ public class Server { if (struct.isSetOs()) { oprot.writeString(struct.os); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(14); + BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -29996,6 +32184,10 @@ public class Server { struct.os = iprot.readString(); struct.setOsIsSet(true); } + if (incoming.get(14)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -30360,6 +32552,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -30369,11 +32562,13 @@ public class Server { public String id; // required public String version; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"), - VERSION((short)2, "version"); + VERSION((short)2, "version"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -30392,6 +32587,8 @@ public class Server { return ID; case 2: // VERSION return VERSION; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -30439,6 +32636,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageData_args.class, metaDataMap); } @@ -30448,11 +32647,13 @@ public class Server { public deleteImageData_args( String id, - String version) + String version, + String token) { this(); this.id = id; this.version = version; + this.token = token; } /** @@ -30465,6 +32666,9 @@ public class Server { if (other.isSetVersion()) { this.version = other.version; } + if (other.isSetToken()) { + this.token = other.token; + } } public deleteImageData_args deepCopy() { @@ -30475,6 +32679,7 @@ public class Server { public void clear() { this.id = null; this.version = null; + this.token = null; } public String getId() { @@ -30525,6 +32730,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public deleteImageData_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ID: @@ -30543,6 +32772,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -30554,6 +32791,9 @@ public class Server { case VERSION: return getVersion(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -30569,6 +32809,8 @@ public class Server { return isSetId(); case VERSION: return isSetVersion(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -30604,6 +32846,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -30640,6 +32891,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -30675,6 +32936,14 @@ public class Server { sb.append(this.version); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -30734,6 +33003,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -30759,6 +33036,11 @@ public class Server { oprot.writeString(struct.version); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -30783,19 +33065,25 @@ public class Server { if (struct.isSetVersion()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetId()) { oprot.writeString(struct.id); } if (struct.isSetVersion()) { oprot.writeString(struct.version); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -30804,6 +33092,10 @@ public class Server { struct.version = iprot.readString(); struct.setVersionIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -31175,14 +33467,11 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)10); 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 UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)18); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -31199,14 +33488,11 @@ public class Server { public boolean isActive; // required public String imageid; // required public String imageversion; // required - public String user; // required - public String firstname; // required - public String lastname; // required - public String university; // required - public String Mail; // required + public String token; // required public String Tel; // required public String Fak; // required public String id; // required + public String university; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -31219,14 +33505,11 @@ public class Server { 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"), + TOKEN((short)10, "token"), TEL((short)15, "Tel"), FAK((short)16, "Fak"), - ID((short)17, "id"); + ID((short)17, "id"), + UNIVERSITY((short)18, "university"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -31259,22 +33542,16 @@ public class Server { return IMAGEID; case 9: // IMAGEVERSION return IMAGEVERSION; - case 10: // USER - return USER; - case 11: // FIRSTNAME - return FIRSTNAME; - case 12: // LASTNAME - return LASTNAME; - case 13: // UNIVERSITY - return UNIVERSITY; - case 14: // MAIL - return MAIL; + case 10: // TOKEN + return TOKEN; case 15: // TEL return TEL; case 16: // FAK return FAK; case 17: // ID return ID; + case 18: // UNIVERSITY + return UNIVERSITY; default: return null; } @@ -31338,15 +33615,7 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.IMAGEVERSION, new org.apache.thrift.meta_data.FieldMetaData("imageversion", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRSTNAME, new org.apache.thrift.meta_data.FieldMetaData("firstname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LASTNAME, new org.apache.thrift.meta_data.FieldMetaData("lastname", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("Mail", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TEL, new org.apache.thrift.meta_data.FieldMetaData("Tel", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -31354,6 +33623,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateLecturedata_args.class, metaDataMap); } @@ -31371,14 +33642,11 @@ public class Server { boolean isActive, String imageid, String imageversion, - String user, - String firstname, - String lastname, - String university, - String Mail, + String token, String Tel, String Fak, - String id) + String id, + String university) { this(); this.name = name; @@ -31391,14 +33659,11 @@ public class Server { setIsActiveIsSet(true); this.imageid = imageid; this.imageversion = imageversion; - this.user = user; - this.firstname = firstname; - this.lastname = lastname; - this.university = university; - this.Mail = Mail; + this.token = token; this.Tel = Tel; this.Fak = Fak; this.id = id; + this.university = university; } /** @@ -31431,20 +33696,8 @@ public class Server { if (other.isSetImageversion()) { this.imageversion = other.imageversion; } - if (other.isSetUser()) { - this.user = other.user; - } - if (other.isSetFirstname()) { - this.firstname = other.firstname; - } - if (other.isSetLastname()) { - this.lastname = other.lastname; - } - if (other.isSetUniversity()) { - this.university = other.university; - } - if (other.isSetMail()) { - this.Mail = other.Mail; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetTel()) { this.Tel = other.Tel; @@ -31455,6 +33708,9 @@ public class Server { if (other.isSetId()) { this.id = other.id; } + if (other.isSetUniversity()) { + this.university = other.university; + } } public updateLecturedata_args deepCopy() { @@ -31473,14 +33729,11 @@ public class Server { this.isActive = false; this.imageid = null; this.imageversion = null; - this.user = null; - this.firstname = null; - this.lastname = null; - this.university = null; - this.Mail = null; + this.token = null; this.Tel = null; this.Fak = null; this.id = null; + this.university = null; } public String getName() { @@ -31698,123 +33951,27 @@ public class Server { } } - public String getUser() { - return this.user; - } - - public updateLecturedata_args setUser(String user) { - this.user = user; - return this; - } - - public void unsetUser() { - this.user = null; - } - - /** Returns true if field user is set (has been assigned a value) and false otherwise */ - public boolean isSetUser() { - return this.user != null; - } - - public void setUserIsSet(boolean value) { - if (!value) { - this.user = null; - } - } - - public String getFirstname() { - return this.firstname; - } - - public updateLecturedata_args setFirstname(String firstname) { - this.firstname = firstname; - return this; - } - - public void unsetFirstname() { - this.firstname = null; - } - - /** Returns true if field firstname is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstname() { - return this.firstname != null; - } - - public void setFirstnameIsSet(boolean value) { - if (!value) { - this.firstname = null; - } - } - - public String getLastname() { - return this.lastname; - } - - public updateLecturedata_args setLastname(String lastname) { - this.lastname = lastname; - return this; - } - - public void unsetLastname() { - this.lastname = null; - } - - /** Returns true if field lastname is set (has been assigned a value) and false otherwise */ - public boolean isSetLastname() { - return this.lastname != null; - } - - public void setLastnameIsSet(boolean value) { - if (!value) { - this.lastname = null; - } - } - - public String getUniversity() { - return this.university; - } - - public updateLecturedata_args setUniversity(String university) { - this.university = university; - return this; - } - - public void unsetUniversity() { - this.university = null; - } - - /** Returns true if field university is set (has been assigned a value) and false otherwise */ - public boolean isSetUniversity() { - return this.university != null; - } - - public void setUniversityIsSet(boolean value) { - if (!value) { - this.university = null; - } - } - - public String getMail() { - return this.Mail; + public String getToken() { + return this.token; } - public updateLecturedata_args setMail(String Mail) { - this.Mail = Mail; + public updateLecturedata_args setToken(String token) { + this.token = token; return this; } - public void unsetMail() { - this.Mail = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field Mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.Mail != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setMailIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.Mail = null; + this.token = null; } } @@ -31890,6 +34047,30 @@ public class Server { } } + public String getUniversity() { + return this.university; + } + + public updateLecturedata_args setUniversity(String university) { + this.university = university; + return this; + } + + public void unsetUniversity() { + this.university = null; + } + + /** Returns true if field university is set (has been assigned a value) and false otherwise */ + public boolean isSetUniversity() { + return this.university != null; + } + + public void setUniversityIsSet(boolean value) { + if (!value) { + this.university = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAME: @@ -31964,43 +34145,11 @@ public class Server { } break; - case USER: - if (value == null) { - unsetUser(); - } else { - setUser((String)value); - } - break; - - case FIRSTNAME: - if (value == null) { - unsetFirstname(); - } else { - setFirstname((String)value); - } - break; - - case LASTNAME: - if (value == null) { - unsetLastname(); - } else { - setLastname((String)value); - } - break; - - case UNIVERSITY: - if (value == null) { - unsetUniversity(); - } else { - setUniversity((String)value); - } - break; - - case MAIL: + case TOKEN: if (value == null) { - unsetMail(); + unsetToken(); } else { - setMail((String)value); + setToken((String)value); } break; @@ -32028,6 +34177,14 @@ public class Server { } break; + case UNIVERSITY: + if (value == null) { + unsetUniversity(); + } else { + setUniversity((String)value); + } + break; + } } @@ -32060,20 +34217,8 @@ public class Server { case IMAGEVERSION: return getImageversion(); - case USER: - return getUser(); - - case FIRSTNAME: - return getFirstname(); - - case LASTNAME: - return getLastname(); - - case UNIVERSITY: - return getUniversity(); - - case MAIL: - return getMail(); + case TOKEN: + return getToken(); case TEL: return getTel(); @@ -32084,6 +34229,9 @@ public class Server { case ID: return getId(); + case UNIVERSITY: + return getUniversity(); + } throw new IllegalStateException(); } @@ -32113,22 +34261,16 @@ public class Server { return isSetImageid(); case IMAGEVERSION: return isSetImageversion(); - case USER: - return isSetUser(); - case FIRSTNAME: - return isSetFirstname(); - case LASTNAME: - return isSetLastname(); - case UNIVERSITY: - return isSetUniversity(); - case MAIL: - return isSetMail(); + case TOKEN: + return isSetToken(); case TEL: return isSetTel(); case FAK: return isSetFak(); case ID: return isSetId(); + case UNIVERSITY: + return isSetUniversity(); } throw new IllegalStateException(); } @@ -32227,48 +34369,12 @@ public class Server { return false; } - boolean this_present_user = true && this.isSetUser(); - boolean that_present_user = true && that.isSetUser(); - if (this_present_user || that_present_user) { - if (!(this_present_user && that_present_user)) - return false; - if (!this.user.equals(that.user)) - return false; - } - - boolean this_present_firstname = true && this.isSetFirstname(); - boolean that_present_firstname = true && that.isSetFirstname(); - if (this_present_firstname || that_present_firstname) { - if (!(this_present_firstname && that_present_firstname)) - return false; - if (!this.firstname.equals(that.firstname)) - return false; - } - - boolean this_present_lastname = true && this.isSetLastname(); - boolean that_present_lastname = true && that.isSetLastname(); - if (this_present_lastname || that_present_lastname) { - if (!(this_present_lastname && that_present_lastname)) - return false; - if (!this.lastname.equals(that.lastname)) - return false; - } - - boolean this_present_university = true && this.isSetUniversity(); - boolean that_present_university = true && that.isSetUniversity(); - if (this_present_university || that_present_university) { - if (!(this_present_university && that_present_university)) - return false; - if (!this.university.equals(that.university)) - return false; - } - - boolean this_present_Mail = true && this.isSetMail(); - boolean that_present_Mail = true && that.isSetMail(); - if (this_present_Mail || that_present_Mail) { - if (!(this_present_Mail && that_present_Mail)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.Mail.equals(that.Mail)) + if (!this.token.equals(that.token)) return false; } @@ -32299,6 +34405,15 @@ public class Server { return false; } + boolean this_present_university = true && this.isSetUniversity(); + boolean that_present_university = true && that.isSetUniversity(); + if (this_present_university || that_present_university) { + if (!(this_present_university && that_present_university)) + return false; + if (!this.university.equals(that.university)) + return false; + } + return true; } @@ -32405,52 +34520,12 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUser()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetFirstname()).compareTo(other.isSetFirstname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetFirstname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstname, other.firstname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastname()).compareTo(other.isSetLastname()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastname()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastname, other.lastname); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetUniversity()).compareTo(other.isSetUniversity()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUniversity()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.university, other.university); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.Mail, other.Mail); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -32485,6 +34560,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetUniversity()).compareTo(other.isSetUniversity()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUniversity()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.university, other.university); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -32573,43 +34658,11 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("user:"); - if (this.user == null) { - sb.append("null"); - } else { - sb.append(this.user); - } - first = false; - if (!first) sb.append(", "); - sb.append("firstname:"); - if (this.firstname == null) { - sb.append("null"); - } else { - sb.append(this.firstname); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastname:"); - if (this.lastname == null) { - sb.append("null"); - } else { - sb.append(this.lastname); - } - first = false; - if (!first) sb.append(", "); - sb.append("university:"); - if (this.university == null) { - sb.append("null"); - } else { - sb.append(this.university); - } - first = false; - if (!first) sb.append(", "); - sb.append("Mail:"); - if (this.Mail == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.Mail); + sb.append(this.token); } first = false; if (!first) sb.append(", "); @@ -32636,6 +34689,14 @@ public class Server { sb.append(this.id); } first = false; + if (!first) sb.append(", "); + sb.append("university:"); + if (this.university == null) { + sb.append("null"); + } else { + sb.append(this.university); + } + first = false; sb.append(")"); return sb.toString(); } @@ -32753,42 +34814,10 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // USER - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.user = iprot.readString(); - struct.setUserIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 11: // FIRSTNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 12: // LASTNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 13: // UNIVERSITY + case 10: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.university = iprot.readString(); - struct.setUniversityIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 14: // MAIL - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.Mail = iprot.readString(); - struct.setMailIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -32817,6 +34846,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 18: // UNIVERSITY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.university = iprot.readString(); + struct.setUniversityIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -32875,29 +34912,9 @@ public class Server { oprot.writeString(struct.imageversion); oprot.writeFieldEnd(); } - if (struct.user != null) { - oprot.writeFieldBegin(USER_FIELD_DESC); - oprot.writeString(struct.user); - oprot.writeFieldEnd(); - } - if (struct.firstname != null) { - oprot.writeFieldBegin(FIRSTNAME_FIELD_DESC); - oprot.writeString(struct.firstname); - oprot.writeFieldEnd(); - } - if (struct.lastname != null) { - oprot.writeFieldBegin(LASTNAME_FIELD_DESC); - oprot.writeString(struct.lastname); - oprot.writeFieldEnd(); - } - if (struct.university != null) { - oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); - oprot.writeString(struct.university); - oprot.writeFieldEnd(); - } - if (struct.Mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.Mail); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } if (struct.Tel != null) { @@ -32915,6 +34932,11 @@ public class Server { oprot.writeString(struct.id); oprot.writeFieldEnd(); } + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -32960,31 +34982,22 @@ public class Server { if (struct.isSetImageversion()) { optionals.set(8); } - if (struct.isSetUser()) { + if (struct.isSetToken()) { optionals.set(9); } - if (struct.isSetFirstname()) { + if (struct.isSetTel()) { optionals.set(10); } - if (struct.isSetLastname()) { + if (struct.isSetFak()) { optionals.set(11); } - if (struct.isSetUniversity()) { + if (struct.isSetId()) { optionals.set(12); } - if (struct.isSetMail()) { + if (struct.isSetUniversity()) { optionals.set(13); } - if (struct.isSetTel()) { - optionals.set(14); - } - if (struct.isSetFak()) { - optionals.set(15); - } - if (struct.isSetId()) { - optionals.set(16); - } - oprot.writeBitSet(optionals, 17); + oprot.writeBitSet(optionals, 14); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -33012,20 +35025,8 @@ public class Server { if (struct.isSetImageversion()) { oprot.writeString(struct.imageversion); } - if (struct.isSetUser()) { - oprot.writeString(struct.user); - } - if (struct.isSetFirstname()) { - oprot.writeString(struct.firstname); - } - if (struct.isSetLastname()) { - oprot.writeString(struct.lastname); - } - if (struct.isSetUniversity()) { - oprot.writeString(struct.university); - } - if (struct.isSetMail()) { - oprot.writeString(struct.Mail); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetTel()) { oprot.writeString(struct.Tel); @@ -33036,12 +35037,15 @@ public class Server { if (struct.isSetId()) { oprot.writeString(struct.id); } + if (struct.isSetUniversity()) { + oprot.writeString(struct.university); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateLecturedata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(17); + BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -33079,37 +35083,25 @@ public class Server { struct.setImageversionIsSet(true); } if (incoming.get(9)) { - struct.user = iprot.readString(); - struct.setUserIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(10)) { - struct.firstname = iprot.readString(); - struct.setFirstnameIsSet(true); - } - if (incoming.get(11)) { - struct.lastname = iprot.readString(); - struct.setLastnameIsSet(true); - } - if (incoming.get(12)) { - struct.university = iprot.readString(); - struct.setUniversityIsSet(true); - } - if (incoming.get(13)) { - struct.Mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(14)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(15)) { + if (incoming.get(11)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } - if (incoming.get(16)) { + if (incoming.get(12)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } + if (incoming.get(13)) { + struct.university = iprot.readString(); + struct.setUniversityIsSet(true); + } } } @@ -33474,6 +35466,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -33483,11 +35476,13 @@ public class Server { public String id; // required public String version; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"), - VERSION((short)2, "version"); + VERSION((short)2, "version"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -33506,6 +35501,8 @@ public class Server { return ID; case 2: // VERSION return VERSION; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -33553,6 +35550,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageServer_args.class, metaDataMap); } @@ -33562,11 +35561,13 @@ public class Server { public deleteImageServer_args( String id, - String version) + String version, + String token) { this(); this.id = id; this.version = version; + this.token = token; } /** @@ -33579,6 +35580,9 @@ public class Server { if (other.isSetVersion()) { this.version = other.version; } + if (other.isSetToken()) { + this.token = other.token; + } } public deleteImageServer_args deepCopy() { @@ -33589,6 +35593,7 @@ public class Server { public void clear() { this.id = null; this.version = null; + this.token = null; } public String getId() { @@ -33639,6 +35644,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public deleteImageServer_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ID: @@ -33657,6 +35686,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -33668,6 +35705,9 @@ public class Server { case VERSION: return getVersion(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -33683,6 +35723,8 @@ public class Server { return isSetId(); case VERSION: return isSetVersion(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -33718,6 +35760,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -33754,6 +35805,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -33789,6 +35850,14 @@ public class Server { sb.append(this.version); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -33848,6 +35917,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -33873,6 +35950,11 @@ public class Server { oprot.writeString(struct.version); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -33897,19 +35979,25 @@ public class Server { if (struct.isSetVersion()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetId()) { oprot.writeString(struct.id); } if (struct.isSetVersion()) { oprot.writeString(struct.version); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageServer_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -33918,6 +36006,10 @@ public class Server { struct.version = iprot.readString(); struct.setVersionIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -34282,6 +36374,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -34291,11 +36384,13 @@ public class Server { public String id; // required public String version; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"), - VERSION((short)2, "version"); + VERSION((short)2, "version"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -34314,6 +36409,8 @@ public class Server { return ID; case 2: // VERSION return VERSION; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -34361,6 +36458,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(connectedToLecture_args.class, metaDataMap); } @@ -34370,11 +36469,13 @@ public class Server { public connectedToLecture_args( String id, - String version) + String version, + String token) { this(); this.id = id; this.version = version; + this.token = token; } /** @@ -34387,6 +36488,9 @@ public class Server { if (other.isSetVersion()) { this.version = other.version; } + if (other.isSetToken()) { + this.token = other.token; + } } public connectedToLecture_args deepCopy() { @@ -34397,6 +36501,7 @@ public class Server { public void clear() { this.id = null; this.version = null; + this.token = null; } public String getId() { @@ -34447,6 +36552,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public connectedToLecture_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ID: @@ -34465,6 +36594,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -34476,6 +36613,9 @@ public class Server { case VERSION: return getVersion(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -34491,6 +36631,8 @@ public class Server { return isSetId(); case VERSION: return isSetVersion(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -34526,6 +36668,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -34562,6 +36713,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -34597,6 +36758,14 @@ public class Server { sb.append(this.version); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -34656,6 +36825,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -34681,6 +36858,11 @@ public class Server { oprot.writeString(struct.version); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -34705,19 +36887,25 @@ public class Server { if (struct.isSetVersion()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetId()) { oprot.writeString(struct.id); } if (struct.isSetVersion()) { oprot.writeString(struct.version); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -34726,6 +36914,10 @@ public class Server { struct.version = iprot.readString(); struct.setVersionIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -35089,8 +37281,8 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); + 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)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -35099,14 +37291,14 @@ public class Server { } public String id; // required - public String hs; // required - public String user; // required + public String token; // required + public String university; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ID((short)1, "id"), - HS((short)2, "hs"), - USER((short)3, "user"); + TOKEN((short)2, "token"), + UNIVERSITY((short)3, "university"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -35123,10 +37315,10 @@ public class Server { switch(fieldId) { case 1: // ID return ID; - case 2: // HS - return HS; - case 3: // USER - return USER; + case 2: // TOKEN + return TOKEN; + case 3: // UNIVERSITY + return UNIVERSITY; default: return null; } @@ -35172,9 +37364,9 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.HS, new org.apache.thrift.meta_data.FieldMetaData("hs", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_args.class, metaDataMap); @@ -35185,13 +37377,13 @@ public class Server { public deleteLecture_args( String id, - String hs, - String user) + String token, + String university) { this(); this.id = id; - this.hs = hs; - this.user = user; + this.token = token; + this.university = university; } /** @@ -35201,11 +37393,11 @@ public class Server { if (other.isSetId()) { this.id = other.id; } - if (other.isSetHs()) { - this.hs = other.hs; + if (other.isSetToken()) { + this.token = other.token; } - if (other.isSetUser()) { - this.user = other.user; + if (other.isSetUniversity()) { + this.university = other.university; } } @@ -35216,8 +37408,8 @@ public class Server { @Override public void clear() { this.id = null; - this.hs = null; - this.user = null; + this.token = null; + this.university = null; } public String getId() { @@ -35244,51 +37436,51 @@ public class Server { } } - public String getHs() { - return this.hs; + public String getToken() { + return this.token; } - public deleteLecture_args setHs(String hs) { - this.hs = hs; + public deleteLecture_args setToken(String token) { + this.token = token; return this; } - public void unsetHs() { - this.hs = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field hs is set (has been assigned a value) and false otherwise */ - public boolean isSetHs() { - return this.hs != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setHsIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.hs = null; + this.token = null; } } - public String getUser() { - return this.user; + public String getUniversity() { + return this.university; } - public deleteLecture_args setUser(String user) { - this.user = user; + public deleteLecture_args setUniversity(String university) { + this.university = university; return this; } - public void unsetUser() { - this.user = null; + public void unsetUniversity() { + this.university = null; } - /** Returns true if field user is set (has been assigned a value) and false otherwise */ - public boolean isSetUser() { - return this.user != null; + /** Returns true if field university is set (has been assigned a value) and false otherwise */ + public boolean isSetUniversity() { + return this.university != null; } - public void setUserIsSet(boolean value) { + public void setUniversityIsSet(boolean value) { if (!value) { - this.user = null; + this.university = null; } } @@ -35302,19 +37494,19 @@ public class Server { } break; - case HS: + case TOKEN: if (value == null) { - unsetHs(); + unsetToken(); } else { - setHs((String)value); + setToken((String)value); } break; - case USER: + case UNIVERSITY: if (value == null) { - unsetUser(); + unsetUniversity(); } else { - setUser((String)value); + setUniversity((String)value); } break; @@ -35326,11 +37518,11 @@ public class Server { case ID: return getId(); - case HS: - return getHs(); + case TOKEN: + return getToken(); - case USER: - return getUser(); + case UNIVERSITY: + return getUniversity(); } throw new IllegalStateException(); @@ -35345,10 +37537,10 @@ public class Server { switch (field) { case ID: return isSetId(); - case HS: - return isSetHs(); - case USER: - return isSetUser(); + case TOKEN: + return isSetToken(); + case UNIVERSITY: + return isSetUniversity(); } throw new IllegalStateException(); } @@ -35375,21 +37567,21 @@ public class Server { return false; } - boolean this_present_hs = true && this.isSetHs(); - boolean that_present_hs = true && that.isSetHs(); - if (this_present_hs || that_present_hs) { - if (!(this_present_hs && that_present_hs)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.hs.equals(that.hs)) + if (!this.token.equals(that.token)) return false; } - boolean this_present_user = true && this.isSetUser(); - boolean that_present_user = true && that.isSetUser(); - if (this_present_user || that_present_user) { - if (!(this_present_user && that_present_user)) + boolean this_present_university = true && this.isSetUniversity(); + boolean that_present_university = true && that.isSetUniversity(); + if (this_present_university || that_present_university) { + if (!(this_present_university && that_present_university)) return false; - if (!this.user.equals(that.user)) + if (!this.university.equals(that.university)) return false; } @@ -35419,22 +37611,22 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetHs()).compareTo(other.isSetHs()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetHs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hs, other.hs); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); + lastComparison = Boolean.valueOf(isSetUniversity()).compareTo(other.isSetUniversity()); if (lastComparison != 0) { return lastComparison; } - if (isSetUser()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); + if (isSetUniversity()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.university, other.university); if (lastComparison != 0) { return lastComparison; } @@ -35467,19 +37659,19 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("hs:"); - if (this.hs == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.hs); + sb.append(this.token); } first = false; if (!first) sb.append(", "); - sb.append("user:"); - if (this.user == null) { + sb.append("university:"); + if (this.university == null) { sb.append("null"); } else { - sb.append(this.user); + sb.append(this.university); } first = false; sb.append(")"); @@ -35533,18 +37725,18 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // HS + case 2: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.hs = iprot.readString(); - struct.setHsIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // USER + case 3: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.user = iprot.readString(); - struct.setUserIsSet(true); + struct.university = iprot.readString(); + struct.setUniversityIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -35569,14 +37761,14 @@ public class Server { oprot.writeString(struct.id); oprot.writeFieldEnd(); } - if (struct.hs != null) { - oprot.writeFieldBegin(HS_FIELD_DESC); - oprot.writeString(struct.hs); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } - if (struct.user != null) { - oprot.writeFieldBegin(USER_FIELD_DESC); - oprot.writeString(struct.user); + if (struct.university != null) { + oprot.writeFieldBegin(UNIVERSITY_FIELD_DESC); + oprot.writeString(struct.university); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -35600,21 +37792,21 @@ public class Server { if (struct.isSetId()) { optionals.set(0); } - if (struct.isSetHs()) { + if (struct.isSetToken()) { optionals.set(1); } - if (struct.isSetUser()) { + if (struct.isSetUniversity()) { optionals.set(2); } oprot.writeBitSet(optionals, 3); if (struct.isSetId()) { oprot.writeString(struct.id); } - if (struct.isSetHs()) { - oprot.writeString(struct.hs); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } - if (struct.isSetUser()) { - oprot.writeString(struct.user); + if (struct.isSetUniversity()) { + oprot.writeString(struct.university); } } @@ -35627,12 +37819,12 @@ public class Server { struct.setIdIsSet(true); } if (incoming.get(1)) { - struct.hs = iprot.readString(); - struct.setHsIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(2)) { - struct.user = iprot.readString(); - struct.setUserIsSet(true); + struct.university = iprot.readString(); + struct.setUniversityIsSet(true); } } } @@ -35997,6 +38189,7 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -36005,10 +38198,12 @@ public class Server { } public String username; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USERNAME((short)1, "username"); + USERNAME((short)1, "username"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -36025,6 +38220,8 @@ public class Server { switch(fieldId) { case 1: // USERNAME return USERNAME; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -36070,6 +38267,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(checkUser_args.class, metaDataMap); } @@ -36078,10 +38277,12 @@ public class Server { } public checkUser_args( - String username) + String username, + String token) { this(); this.username = username; + this.token = token; } /** @@ -36091,6 +38292,9 @@ public class Server { if (other.isSetUsername()) { this.username = other.username; } + if (other.isSetToken()) { + this.token = other.token; + } } public checkUser_args deepCopy() { @@ -36100,6 +38304,7 @@ public class Server { @Override public void clear() { this.username = null; + this.token = null; } public String getUsername() { @@ -36126,6 +38331,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public checkUser_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USERNAME: @@ -36136,6 +38365,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -36144,6 +38381,9 @@ public class Server { case USERNAME: return getUsername(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -36157,6 +38397,8 @@ public class Server { switch (field) { case USERNAME: return isSetUsername(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -36183,6 +38425,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -36209,6 +38460,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -36236,6 +38497,14 @@ public class Server { sb.append(this.username); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -36287,6 +38556,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -36307,6 +38584,11 @@ public class Server { oprot.writeString(struct.username); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -36328,20 +38610,30 @@ public class Server { if (struct.isSetUsername()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUsername()) { oprot.writeString(struct.username); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, checkUser_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.username = iprot.readString(); struct.setUsernameIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -36704,11 +38996,8 @@ 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); + 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)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -36716,19 +39005,13 @@ public class Server { schemes.put(TupleScheme.class, new createUser_argsTupleSchemeFactory()); } - public String loginName; // required - public String lastName; // required - public String firstName; // required - public String mail; // required + public String token; // required public String university; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - LOGIN_NAME((short)1, "loginName"), - LAST_NAME((short)2, "lastName"), - FIRST_NAME((short)3, "firstName"), - MAIL((short)4, "mail"), - UNIVERSITY((short)5, "university"); + TOKEN((short)1, "token"), + UNIVERSITY((short)2, "university"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -36743,15 +39026,9 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // LOGIN_NAME - return LOGIN_NAME; - case 2: // LAST_NAME - return LAST_NAME; - case 3: // FIRST_NAME - return FIRST_NAME; - case 4: // MAIL - return MAIL; - case 5: // UNIVERSITY + case 1: // TOKEN + return TOKEN; + case 2: // UNIVERSITY return UNIVERSITY; default: return null; @@ -36796,13 +39073,7 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.LOGIN_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("mail", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -36814,17 +39085,11 @@ public class Server { } public createUser_args( - String loginName, - String lastName, - String firstName, - String mail, + String token, String university) { this(); - this.loginName = loginName; - this.lastName = lastName; - this.firstName = firstName; - this.mail = mail; + this.token = token; this.university = university; } @@ -36832,17 +39097,8 @@ public class Server { * Performs a deep copy on <i>other</i>. */ public createUser_args(createUser_args other) { - if (other.isSetLoginName()) { - this.loginName = other.loginName; - } - if (other.isSetLastName()) { - this.lastName = other.lastName; - } - if (other.isSetFirstName()) { - this.firstName = other.firstName; - } - if (other.isSetMail()) { - this.mail = other.mail; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetUniversity()) { this.university = other.university; @@ -36855,106 +39111,31 @@ public class Server { @Override public void clear() { - this.loginName = null; - this.lastName = null; - this.firstName = null; - this.mail = null; + this.token = null; this.university = null; } - public String getLoginName() { - return this.loginName; - } - - public createUser_args setLoginName(String loginName) { - this.loginName = loginName; - return this; - } - - public void unsetLoginName() { - this.loginName = null; - } - - /** Returns true if field loginName is set (has been assigned a value) and false otherwise */ - public boolean isSetLoginName() { - return this.loginName != null; - } - - public void setLoginNameIsSet(boolean value) { - if (!value) { - this.loginName = null; - } - } - - public String getLastName() { - return this.lastName; - } - - public createUser_args setLastName(String lastName) { - this.lastName = lastName; - return this; - } - - public void unsetLastName() { - this.lastName = null; - } - - /** Returns true if field lastName is set (has been assigned a value) and false otherwise */ - public boolean isSetLastName() { - return this.lastName != null; - } - - public void setLastNameIsSet(boolean value) { - if (!value) { - this.lastName = null; - } - } - - public String getFirstName() { - return this.firstName; - } - - public createUser_args setFirstName(String firstName) { - this.firstName = firstName; - return this; - } - - public void unsetFirstName() { - this.firstName = null; - } - - /** Returns true if field firstName is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstName() { - return this.firstName != null; - } - - public void setFirstNameIsSet(boolean value) { - if (!value) { - this.firstName = null; - } - } - - public String getMail() { - return this.mail; + public String getToken() { + return this.token; } - public createUser_args setMail(String mail) { - this.mail = mail; + public createUser_args setToken(String token) { + this.token = token; return this; } - public void unsetMail() { - this.mail = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.mail != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setMailIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.mail = null; + this.token = null; } } @@ -36984,35 +39165,11 @@ public class Server { public void setFieldValue(_Fields field, Object value) { switch (field) { - case LOGIN_NAME: - if (value == null) { - unsetLoginName(); - } else { - setLoginName((String)value); - } - break; - - case LAST_NAME: - if (value == null) { - unsetLastName(); - } else { - setLastName((String)value); - } - break; - - case FIRST_NAME: - if (value == null) { - unsetFirstName(); - } else { - setFirstName((String)value); - } - break; - - case MAIL: + case TOKEN: if (value == null) { - unsetMail(); + unsetToken(); } else { - setMail((String)value); + setToken((String)value); } break; @@ -37029,17 +39186,8 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case LOGIN_NAME: - return getLoginName(); - - case LAST_NAME: - return getLastName(); - - case FIRST_NAME: - return getFirstName(); - - case MAIL: - return getMail(); + case TOKEN: + return getToken(); case UNIVERSITY: return getUniversity(); @@ -37055,14 +39203,8 @@ public class Server { } switch (field) { - case LOGIN_NAME: - return isSetLoginName(); - case LAST_NAME: - return isSetLastName(); - case FIRST_NAME: - return isSetFirstName(); - case MAIL: - return isSetMail(); + case TOKEN: + return isSetToken(); case UNIVERSITY: return isSetUniversity(); } @@ -37082,39 +39224,12 @@ public class Server { if (that == null) return false; - boolean this_present_loginName = true && this.isSetLoginName(); - boolean that_present_loginName = true && that.isSetLoginName(); - if (this_present_loginName || that_present_loginName) { - if (!(this_present_loginName && that_present_loginName)) - return false; - if (!this.loginName.equals(that.loginName)) - return false; - } - - boolean this_present_lastName = true && this.isSetLastName(); - boolean that_present_lastName = true && that.isSetLastName(); - if (this_present_lastName || that_present_lastName) { - if (!(this_present_lastName && that_present_lastName)) - return false; - if (!this.lastName.equals(that.lastName)) - return false; - } - - boolean this_present_firstName = true && this.isSetFirstName(); - boolean that_present_firstName = true && that.isSetFirstName(); - if (this_present_firstName || that_present_firstName) { - if (!(this_present_firstName && that_present_firstName)) - return false; - if (!this.firstName.equals(that.firstName)) - return false; - } - - boolean this_present_mail = true && this.isSetMail(); - boolean that_present_mail = true && that.isSetMail(); - if (this_present_mail || that_present_mail) { - if (!(this_present_mail && that_present_mail)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.mail.equals(that.mail)) + if (!this.token.equals(that.token)) return false; } @@ -37143,42 +39258,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetLoginName()).compareTo(other.isSetLoginName()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLoginName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loginName, other.loginName); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetFirstName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mail, other.mail); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -37213,35 +39298,11 @@ public class Server { StringBuilder sb = new StringBuilder("createUser_args("); boolean first = true; - sb.append("loginName:"); - if (this.loginName == null) { - sb.append("null"); - } else { - sb.append(this.loginName); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastName:"); - if (this.lastName == null) { - sb.append("null"); - } else { - sb.append(this.lastName); - } - first = false; - if (!first) sb.append(", "); - sb.append("firstName:"); - if (this.firstName == null) { - sb.append("null"); - } else { - sb.append(this.firstName); - } - first = false; - if (!first) sb.append(", "); - sb.append("mail:"); - if (this.mail == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.mail); + sb.append(this.token); } first = false; if (!first) sb.append(", "); @@ -37295,39 +39356,15 @@ public class Server { break; } switch (schemeField.id) { - case 1: // LOGIN_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.loginName = iprot.readString(); - struct.setLoginNameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // LAST_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastName = iprot.readString(); - struct.setLastNameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // FIRST_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstName = iprot.readString(); - struct.setFirstNameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // MAIL + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // UNIVERSITY + case 2: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -37350,24 +39387,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.loginName != null) { - oprot.writeFieldBegin(LOGIN_NAME_FIELD_DESC); - oprot.writeString(struct.loginName); - oprot.writeFieldEnd(); - } - if (struct.lastName != null) { - oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); - oprot.writeString(struct.lastName); - oprot.writeFieldEnd(); - } - if (struct.firstName != null) { - oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); - oprot.writeString(struct.firstName); - oprot.writeFieldEnd(); - } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } if (struct.university != null) { @@ -37393,33 +39415,15 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, createUser_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetLoginName()) { + if (struct.isSetToken()) { optionals.set(0); } - if (struct.isSetLastName()) { - optionals.set(1); - } - if (struct.isSetFirstName()) { - optionals.set(2); - } - if (struct.isSetMail()) { - optionals.set(3); - } if (struct.isSetUniversity()) { - optionals.set(4); - } - oprot.writeBitSet(optionals, 5); - if (struct.isSetLoginName()) { - oprot.writeString(struct.loginName); - } - if (struct.isSetLastName()) { - oprot.writeString(struct.lastName); - } - if (struct.isSetFirstName()) { - oprot.writeString(struct.firstName); + optionals.set(1); } - if (struct.isSetMail()) { - oprot.writeString(struct.mail); + oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetUniversity()) { oprot.writeString(struct.university); @@ -37429,24 +39433,12 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, createUser_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.loginName = iprot.readString(); - struct.setLoginNameIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(1)) { - struct.lastName = iprot.readString(); - struct.setLastNameIsSet(true); - } - if (incoming.get(2)) { - struct.firstName = iprot.readString(); - struct.setFirstNameIsSet(true); - } - if (incoming.get(3)) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(4)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } @@ -37813,12 +39805,10 @@ public class Server { 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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); + 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)3); + 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)4); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -37827,22 +39817,18 @@ public class Server { } public String imagename; // required - public String username; // required - public String lastName; // required - public String firstName; // required - public String mail; // required - public String university; // required + public String token; // required public String role; // required + public String university; // required + public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { 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"); + TOKEN((short)2, "token"), + ROLE((short)3, "role"), + UNIVERSITY((short)4, "university"), + USER_ID((short)5, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -37859,18 +39845,14 @@ public class Server { switch(fieldId) { case 1: // IMAGENAME return IMAGENAME; - case 2: // USERNAME - return USERNAME; - case 3: // LAST_NAME - return LAST_NAME; - case 4: // FIRST_NAME - return FIRST_NAME; - case 5: // MAIL - return MAIL; - case 6: // UNIVERSITY - return UNIVERSITY; - case 7: // ROLE + case 2: // TOKEN + return TOKEN; + case 3: // ROLE return ROLE; + case 4: // UNIVERSITY + return UNIVERSITY; + case 5: // USER_ID + return USER_ID; default: return null; } @@ -37916,17 +39898,13 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.IMAGENAME, new org.apache.thrift.meta_data.FieldMetaData("imagename", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("mail", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.ROLE, new org.apache.thrift.meta_data.FieldMetaData("role", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.ROLE, new org.apache.thrift.meta_data.FieldMetaData("role", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeImageRights_args.class, metaDataMap); @@ -37937,21 +39915,17 @@ public class Server { public writeImageRights_args( String imagename, - String username, - String lastName, - String firstName, - String mail, + String token, + String role, String university, - String role) + String userID) { this(); this.imagename = imagename; - this.username = username; - this.lastName = lastName; - this.firstName = firstName; - this.mail = mail; - this.university = university; + this.token = token; this.role = role; + this.university = university; + this.userID = userID; } /** @@ -37961,23 +39935,17 @@ public class Server { if (other.isSetImagename()) { this.imagename = other.imagename; } - if (other.isSetUsername()) { - this.username = other.username; - } - if (other.isSetLastName()) { - this.lastName = other.lastName; - } - if (other.isSetFirstName()) { - this.firstName = other.firstName; + if (other.isSetToken()) { + this.token = other.token; } - if (other.isSetMail()) { - this.mail = other.mail; + if (other.isSetRole()) { + this.role = other.role; } if (other.isSetUniversity()) { this.university = other.university; } - if (other.isSetRole()) { - this.role = other.role; + if (other.isSetUserID()) { + this.userID = other.userID; } } @@ -37988,12 +39956,10 @@ public class Server { @Override public void clear() { this.imagename = null; - this.username = null; - this.lastName = null; - this.firstName = null; - this.mail = null; - this.university = null; + this.token = null; this.role = null; + this.university = null; + this.userID = null; } public String getImagename() { @@ -38020,99 +39986,51 @@ public class Server { } } - public String getUsername() { - return this.username; - } - - public writeImageRights_args setUsername(String username) { - this.username = username; - return this; - } - - public void unsetUsername() { - this.username = null; - } - - /** Returns true if field username is set (has been assigned a value) and false otherwise */ - public boolean isSetUsername() { - return this.username != null; - } - - public void setUsernameIsSet(boolean value) { - if (!value) { - this.username = null; - } - } - - public String getLastName() { - return this.lastName; - } - - public writeImageRights_args setLastName(String lastName) { - this.lastName = lastName; - return this; - } - - public void unsetLastName() { - this.lastName = null; - } - - /** Returns true if field lastName is set (has been assigned a value) and false otherwise */ - public boolean isSetLastName() { - return this.lastName != null; - } - - public void setLastNameIsSet(boolean value) { - if (!value) { - this.lastName = null; - } - } - - public String getFirstName() { - return this.firstName; + public String getToken() { + return this.token; } - public writeImageRights_args setFirstName(String firstName) { - this.firstName = firstName; + public writeImageRights_args setToken(String token) { + this.token = token; return this; } - public void unsetFirstName() { - this.firstName = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field firstName is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstName() { - return this.firstName != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setFirstNameIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.firstName = null; + this.token = null; } } - public String getMail() { - return this.mail; + public String getRole() { + return this.role; } - public writeImageRights_args setMail(String mail) { - this.mail = mail; + public writeImageRights_args setRole(String role) { + this.role = role; return this; } - public void unsetMail() { - this.mail = null; + public void unsetRole() { + this.role = null; } - /** Returns true if field mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.mail != null; + /** Returns true if field role is set (has been assigned a value) and false otherwise */ + public boolean isSetRole() { + return this.role != null; } - public void setMailIsSet(boolean value) { + public void setRoleIsSet(boolean value) { if (!value) { - this.mail = null; + this.role = null; } } @@ -38140,27 +40058,27 @@ public class Server { } } - public String getRole() { - return this.role; + public String getUserID() { + return this.userID; } - public writeImageRights_args setRole(String role) { - this.role = role; + public writeImageRights_args setUserID(String userID) { + this.userID = userID; return this; } - public void unsetRole() { - this.role = null; + public void unsetUserID() { + this.userID = null; } - /** Returns true if field role is set (has been assigned a value) and false otherwise */ - public boolean isSetRole() { - return this.role != null; + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; } - public void setRoleIsSet(boolean value) { + public void setUserIDIsSet(boolean value) { if (!value) { - this.role = null; + this.userID = null; } } @@ -38174,35 +40092,19 @@ public class Server { } break; - case USERNAME: - if (value == null) { - unsetUsername(); - } else { - setUsername((String)value); - } - break; - - case LAST_NAME: - if (value == null) { - unsetLastName(); - } else { - setLastName((String)value); - } - break; - - case FIRST_NAME: + case TOKEN: if (value == null) { - unsetFirstName(); + unsetToken(); } else { - setFirstName((String)value); + setToken((String)value); } break; - case MAIL: + case ROLE: if (value == null) { - unsetMail(); + unsetRole(); } else { - setMail((String)value); + setRole((String)value); } break; @@ -38214,11 +40116,11 @@ public class Server { } break; - case ROLE: + case USER_ID: if (value == null) { - unsetRole(); + unsetUserID(); } else { - setRole((String)value); + setUserID((String)value); } break; @@ -38230,23 +40132,17 @@ public class Server { case IMAGENAME: return getImagename(); - case USERNAME: - return getUsername(); - - case LAST_NAME: - return getLastName(); - - case FIRST_NAME: - return getFirstName(); + case TOKEN: + return getToken(); - case MAIL: - return getMail(); + case ROLE: + return getRole(); case UNIVERSITY: return getUniversity(); - case ROLE: - return getRole(); + case USER_ID: + return getUserID(); } throw new IllegalStateException(); @@ -38261,18 +40157,14 @@ public class Server { switch (field) { case IMAGENAME: return isSetImagename(); - case USERNAME: - return isSetUsername(); - case LAST_NAME: - return isSetLastName(); - case FIRST_NAME: - return isSetFirstName(); - case MAIL: - return isSetMail(); - case UNIVERSITY: - return isSetUniversity(); + case TOKEN: + return isSetToken(); case ROLE: return isSetRole(); + case UNIVERSITY: + return isSetUniversity(); + case USER_ID: + return isSetUserID(); } throw new IllegalStateException(); } @@ -38299,39 +40191,21 @@ public class Server { return false; } - boolean this_present_username = true && this.isSetUsername(); - boolean that_present_username = true && that.isSetUsername(); - if (this_present_username || that_present_username) { - if (!(this_present_username && that_present_username)) - return false; - if (!this.username.equals(that.username)) - return false; - } - - boolean this_present_lastName = true && this.isSetLastName(); - boolean that_present_lastName = true && that.isSetLastName(); - if (this_present_lastName || that_present_lastName) { - if (!(this_present_lastName && that_present_lastName)) - return false; - if (!this.lastName.equals(that.lastName)) - return false; - } - - boolean this_present_firstName = true && this.isSetFirstName(); - boolean that_present_firstName = true && that.isSetFirstName(); - if (this_present_firstName || that_present_firstName) { - if (!(this_present_firstName && that_present_firstName)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.firstName.equals(that.firstName)) + if (!this.token.equals(that.token)) return false; } - boolean this_present_mail = true && this.isSetMail(); - boolean that_present_mail = true && that.isSetMail(); - if (this_present_mail || that_present_mail) { - if (!(this_present_mail && that_present_mail)) + boolean this_present_role = true && this.isSetRole(); + boolean that_present_role = true && that.isSetRole(); + if (this_present_role || that_present_role) { + if (!(this_present_role && that_present_role)) return false; - if (!this.mail.equals(that.mail)) + if (!this.role.equals(that.role)) return false; } @@ -38344,12 +40218,12 @@ public class Server { return false; } - boolean this_present_role = true && this.isSetRole(); - boolean that_present_role = true && that.isSetRole(); - if (this_present_role || that_present_role) { - if (!(this_present_role && that_present_role)) + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) return false; - if (!this.role.equals(that.role)) + if (!this.userID.equals(that.userID)) return false; } @@ -38379,42 +40253,22 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUsername()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetFirstName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); + lastComparison = Boolean.valueOf(isSetRole()).compareTo(other.isSetRole()); if (lastComparison != 0) { return lastComparison; } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mail, other.mail); + if (isSetRole()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.role, other.role); if (lastComparison != 0) { return lastComparison; } @@ -38429,12 +40283,12 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRole()).compareTo(other.isSetRole()); + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); if (lastComparison != 0) { return lastComparison; } - if (isSetRole()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.role, other.role); + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); if (lastComparison != 0) { return lastComparison; } @@ -38467,35 +40321,19 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("username:"); - if (this.username == null) { - sb.append("null"); - } else { - sb.append(this.username); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastName:"); - if (this.lastName == null) { - sb.append("null"); - } else { - sb.append(this.lastName); - } - first = false; - if (!first) sb.append(", "); - sb.append("firstName:"); - if (this.firstName == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.firstName); + sb.append(this.token); } first = false; if (!first) sb.append(", "); - sb.append("mail:"); - if (this.mail == null) { + sb.append("role:"); + if (this.role == null) { sb.append("null"); } else { - sb.append(this.mail); + sb.append(this.role); } first = false; if (!first) sb.append(", "); @@ -38507,11 +40345,11 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("role:"); - if (this.role == null) { + sb.append("userID:"); + if (this.userID == null) { sb.append("null"); } else { - sb.append(this.role); + sb.append(this.userID); } first = false; sb.append(")"); @@ -38565,39 +40403,23 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // USERNAME + case 2: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.username = iprot.readString(); - struct.setUsernameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // LAST_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastName = iprot.readString(); - struct.setLastNameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // FIRST_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstName = iprot.readString(); - struct.setFirstNameIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // MAIL + case 3: // ROLE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); + struct.role = iprot.readString(); + struct.setRoleIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // UNIVERSITY + case 4: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -38605,10 +40427,10 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // ROLE + case 5: // USER_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.role = iprot.readString(); - struct.setRoleIsSet(true); + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -38633,24 +40455,14 @@ public class Server { oprot.writeString(struct.imagename); oprot.writeFieldEnd(); } - if (struct.username != null) { - oprot.writeFieldBegin(USERNAME_FIELD_DESC); - oprot.writeString(struct.username); - oprot.writeFieldEnd(); - } - if (struct.lastName != null) { - oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); - oprot.writeString(struct.lastName); - oprot.writeFieldEnd(); - } - if (struct.firstName != null) { - oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); - oprot.writeString(struct.firstName); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.role != null) { + oprot.writeFieldBegin(ROLE_FIELD_DESC); + oprot.writeString(struct.role); oprot.writeFieldEnd(); } if (struct.university != null) { @@ -38658,9 +40470,9 @@ public class Server { oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.role != null) { - oprot.writeFieldBegin(ROLE_FIELD_DESC); - oprot.writeString(struct.role); + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -38684,79 +40496,59 @@ public class Server { if (struct.isSetImagename()) { optionals.set(0); } - if (struct.isSetUsername()) { + if (struct.isSetToken()) { optionals.set(1); } - if (struct.isSetLastName()) { + if (struct.isSetRole()) { optionals.set(2); } - if (struct.isSetFirstName()) { + if (struct.isSetUniversity()) { optionals.set(3); } - if (struct.isSetMail()) { + if (struct.isSetUserID()) { optionals.set(4); } - if (struct.isSetUniversity()) { - optionals.set(5); - } - if (struct.isSetRole()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); + oprot.writeBitSet(optionals, 5); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } - if (struct.isSetUsername()) { - oprot.writeString(struct.username); - } - if (struct.isSetLastName()) { - oprot.writeString(struct.lastName); - } - if (struct.isSetFirstName()) { - oprot.writeString(struct.firstName); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } - if (struct.isSetMail()) { - oprot.writeString(struct.mail); + if (struct.isSetRole()) { + oprot.writeString(struct.role); } if (struct.isSetUniversity()) { oprot.writeString(struct.university); } - if (struct.isSetRole()) { - oprot.writeString(struct.role); + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeImageRights_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(7); + BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); } if (incoming.get(1)) { - struct.username = iprot.readString(); - struct.setUsernameIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(2)) { - struct.lastName = iprot.readString(); - struct.setLastNameIsSet(true); + struct.role = iprot.readString(); + struct.setRoleIsSet(true); } if (incoming.get(3)) { - struct.firstName = iprot.readString(); - struct.setFirstNameIsSet(true); - } - if (incoming.get(4)) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(5)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } - if (incoming.get(6)) { - struct.role = iprot.readString(); - struct.setRoleIsSet(true); + if (incoming.get(4)) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } } } @@ -39126,6 +40918,7 @@ public class Server { private static final org.apache.thrift.protocol.TField IS_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("isWrite", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final org.apache.thrift.protocol.TField IS_LINK_ALLOWED_FIELD_DESC = new org.apache.thrift.protocol.TField("isLinkAllowed", org.apache.thrift.protocol.TType.BOOL, (short)5); private static final org.apache.thrift.protocol.TField IS_ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("isAdmin", org.apache.thrift.protocol.TType.BOOL, (short)6); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -39139,6 +40932,7 @@ public class Server { public boolean isWrite; // required public boolean isLinkAllowed; // required public boolean isAdmin; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -39147,7 +40941,8 @@ public class Server { IS_READ((short)3, "isRead"), IS_WRITE((short)4, "isWrite"), IS_LINK_ALLOWED((short)5, "isLinkAllowed"), - IS_ADMIN((short)6, "isAdmin"); + IS_ADMIN((short)6, "isAdmin"), + TOKEN((short)7, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -39174,6 +40969,8 @@ public class Server { return IS_LINK_ALLOWED; case 6: // IS_ADMIN return IS_ADMIN; + case 7: // TOKEN + return TOKEN; default: return null; } @@ -39234,6 +41031,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.IS_ADMIN, new org.apache.thrift.meta_data.FieldMetaData("isAdmin", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeAdditionalImageRights_args.class, metaDataMap); } @@ -39247,7 +41046,8 @@ public class Server { boolean isRead, boolean isWrite, boolean isLinkAllowed, - boolean isAdmin) + boolean isAdmin, + String token) { this(); this.imageName = imageName; @@ -39260,6 +41060,7 @@ public class Server { setIsLinkAllowedIsSet(true); this.isAdmin = isAdmin; setIsAdminIsSet(true); + this.token = token; } /** @@ -39277,6 +41078,9 @@ public class Server { this.isWrite = other.isWrite; this.isLinkAllowed = other.isLinkAllowed; this.isAdmin = other.isAdmin; + if (other.isSetToken()) { + this.token = other.token; + } } public writeAdditionalImageRights_args deepCopy() { @@ -39295,6 +41099,7 @@ public class Server { this.isLinkAllowed = false; setIsAdminIsSet(false); this.isAdmin = false; + this.token = null; } public String getImageName() { @@ -39437,6 +41242,30 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISADMIN_ISSET_ID, value); } + public String getToken() { + return this.token; + } + + public writeAdditionalImageRights_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGE_NAME: @@ -39487,6 +41316,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -39510,6 +41347,9 @@ public class Server { case IS_ADMIN: return Boolean.valueOf(isIsAdmin()); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -39533,6 +41373,8 @@ public class Server { return isSetIsLinkAllowed(); case IS_ADMIN: return isSetIsAdmin(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -39604,6 +41446,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -39680,6 +41531,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -39731,6 +41592,14 @@ public class Server { sb.append("isAdmin:"); sb.append(this.isAdmin); first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -39824,6 +41693,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -39861,6 +41738,11 @@ public class Server { oprot.writeFieldBegin(IS_ADMIN_FIELD_DESC); oprot.writeBool(struct.isAdmin); oprot.writeFieldEnd(); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -39897,7 +41779,10 @@ public class Server { if (struct.isSetIsAdmin()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetToken()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetImageName()) { oprot.writeString(struct.imageName); } @@ -39916,12 +41801,15 @@ public class Server { if (struct.isSetIsAdmin()) { oprot.writeBool(struct.isAdmin); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeAdditionalImageRights_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.imageName = iprot.readString(); struct.setImageNameIsSet(true); @@ -39946,6 +41834,10 @@ public class Server { struct.isAdmin = iprot.readBool(); struct.setIsAdminIsSet(true); } + if (incoming.get(6)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -40308,13 +42200,11 @@ 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 LECTURE_ID_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 ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); + 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)4); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -40322,23 +42212,19 @@ public class Server { schemes.put(TupleScheme.class, new writeLectureRights_argsTupleSchemeFactory()); } - public String lecturename; // required - public String username; // required - public String lastName; // required - public String firstName; // required - public String mail; // required - public String university; // required + public String lectureID; // required public String role; // required + public String token; // required + public String university; // required + public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - 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"); + LECTURE_ID((short)1, "lectureID"), + ROLE((short)2, "role"), + TOKEN((short)3, "token"), + UNIVERSITY((short)4, "university"), + USER_ID((short)5, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -40353,20 +42239,16 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // LECTURENAME - return LECTURENAME; - case 2: // USERNAME - return USERNAME; - case 3: // LAST_NAME - return LAST_NAME; - case 4: // FIRST_NAME - return FIRST_NAME; - case 5: // MAIL - return MAIL; - case 6: // UNIVERSITY - return UNIVERSITY; - case 7: // ROLE + case 1: // LECTURE_ID + return LECTURE_ID; + case 2: // ROLE return ROLE; + case 3: // TOKEN + return TOKEN; + case 4: // UNIVERSITY + return UNIVERSITY; + case 5: // USER_ID + return USER_ID; default: return null; } @@ -40410,19 +42292,15 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.LECTURENAME, new org.apache.thrift.meta_data.FieldMetaData("lecturename", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.ROLE, new org.apache.thrift.meta_data.FieldMetaData("role", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MAIL, new org.apache.thrift.meta_data.FieldMetaData("mail", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.UNIVERSITY, new org.apache.thrift.meta_data.FieldMetaData("university", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.ROLE, new org.apache.thrift.meta_data.FieldMetaData("role", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeLectureRights_args.class, metaDataMap); @@ -40432,48 +42310,38 @@ public class Server { } public writeLectureRights_args( - String lecturename, - String username, - String lastName, - String firstName, - String mail, + String lectureID, + String role, + String token, String university, - String role) + String userID) { this(); - this.lecturename = lecturename; - this.username = username; - this.lastName = lastName; - this.firstName = firstName; - this.mail = mail; - this.university = university; + this.lectureID = lectureID; this.role = role; + this.token = token; + this.university = university; + this.userID = userID; } /** * Performs a deep copy on <i>other</i>. */ public writeLectureRights_args(writeLectureRights_args other) { - if (other.isSetLecturename()) { - this.lecturename = other.lecturename; - } - if (other.isSetUsername()) { - this.username = other.username; - } - if (other.isSetLastName()) { - this.lastName = other.lastName; + if (other.isSetLectureID()) { + this.lectureID = other.lectureID; } - if (other.isSetFirstName()) { - this.firstName = other.firstName; + if (other.isSetRole()) { + this.role = other.role; } - if (other.isSetMail()) { - this.mail = other.mail; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetUniversity()) { this.university = other.university; } - if (other.isSetRole()) { - this.role = other.role; + if (other.isSetUserID()) { + this.userID = other.userID; } } @@ -40483,132 +42351,82 @@ public class Server { @Override public void clear() { - this.lecturename = null; - this.username = null; - this.lastName = null; - this.firstName = null; - this.mail = null; - this.university = null; + this.lectureID = null; this.role = null; + this.token = null; + this.university = null; + this.userID = null; } - public String getLecturename() { - return this.lecturename; - } - - public writeLectureRights_args setLecturename(String lecturename) { - this.lecturename = lecturename; - return this; - } - - public void unsetLecturename() { - this.lecturename = null; - } - - /** Returns true if field lecturename is set (has been assigned a value) and false otherwise */ - public boolean isSetLecturename() { - return this.lecturename != null; - } - - public void setLecturenameIsSet(boolean value) { - if (!value) { - this.lecturename = null; - } - } - - public String getUsername() { - return this.username; - } - - public writeLectureRights_args setUsername(String username) { - this.username = username; - return this; - } - - public void unsetUsername() { - this.username = null; - } - - /** Returns true if field username is set (has been assigned a value) and false otherwise */ - public boolean isSetUsername() { - return this.username != null; - } - - public void setUsernameIsSet(boolean value) { - if (!value) { - this.username = null; - } - } - - public String getLastName() { - return this.lastName; + public String getLectureID() { + return this.lectureID; } - public writeLectureRights_args setLastName(String lastName) { - this.lastName = lastName; + public writeLectureRights_args setLectureID(String lectureID) { + this.lectureID = lectureID; return this; } - public void unsetLastName() { - this.lastName = null; + public void unsetLectureID() { + this.lectureID = null; } - /** Returns true if field lastName is set (has been assigned a value) and false otherwise */ - public boolean isSetLastName() { - return this.lastName != null; + /** Returns true if field lectureID is set (has been assigned a value) and false otherwise */ + public boolean isSetLectureID() { + return this.lectureID != null; } - public void setLastNameIsSet(boolean value) { + public void setLectureIDIsSet(boolean value) { if (!value) { - this.lastName = null; + this.lectureID = null; } } - public String getFirstName() { - return this.firstName; + public String getRole() { + return this.role; } - public writeLectureRights_args setFirstName(String firstName) { - this.firstName = firstName; + public writeLectureRights_args setRole(String role) { + this.role = role; return this; } - public void unsetFirstName() { - this.firstName = null; + public void unsetRole() { + this.role = null; } - /** Returns true if field firstName is set (has been assigned a value) and false otherwise */ - public boolean isSetFirstName() { - return this.firstName != null; + /** Returns true if field role is set (has been assigned a value) and false otherwise */ + public boolean isSetRole() { + return this.role != null; } - public void setFirstNameIsSet(boolean value) { + public void setRoleIsSet(boolean value) { if (!value) { - this.firstName = null; + this.role = null; } } - public String getMail() { - return this.mail; + public String getToken() { + return this.token; } - public writeLectureRights_args setMail(String mail) { - this.mail = mail; + public writeLectureRights_args setToken(String token) { + this.token = token; return this; } - public void unsetMail() { - this.mail = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field mail is set (has been assigned a value) and false otherwise */ - public boolean isSetMail() { - return this.mail != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setMailIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.mail = null; + this.token = null; } } @@ -40636,69 +42454,53 @@ public class Server { } } - public String getRole() { - return this.role; + public String getUserID() { + return this.userID; } - public writeLectureRights_args setRole(String role) { - this.role = role; + public writeLectureRights_args setUserID(String userID) { + this.userID = userID; return this; } - public void unsetRole() { - this.role = null; + public void unsetUserID() { + this.userID = null; } - /** Returns true if field role is set (has been assigned a value) and false otherwise */ - public boolean isSetRole() { - return this.role != null; + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; } - public void setRoleIsSet(boolean value) { + public void setUserIDIsSet(boolean value) { if (!value) { - this.role = null; + this.userID = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case LECTURENAME: - if (value == null) { - unsetLecturename(); - } else { - setLecturename((String)value); - } - break; - - case USERNAME: - if (value == null) { - unsetUsername(); - } else { - setUsername((String)value); - } - break; - - case LAST_NAME: + case LECTURE_ID: if (value == null) { - unsetLastName(); + unsetLectureID(); } else { - setLastName((String)value); + setLectureID((String)value); } break; - case FIRST_NAME: + case ROLE: if (value == null) { - unsetFirstName(); + unsetRole(); } else { - setFirstName((String)value); + setRole((String)value); } break; - case MAIL: + case TOKEN: if (value == null) { - unsetMail(); + unsetToken(); } else { - setMail((String)value); + setToken((String)value); } break; @@ -40710,11 +42512,11 @@ public class Server { } break; - case ROLE: + case USER_ID: if (value == null) { - unsetRole(); + unsetUserID(); } else { - setRole((String)value); + setUserID((String)value); } break; @@ -40723,26 +42525,20 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case LECTURENAME: - return getLecturename(); - - case USERNAME: - return getUsername(); - - case LAST_NAME: - return getLastName(); + case LECTURE_ID: + return getLectureID(); - case FIRST_NAME: - return getFirstName(); + case ROLE: + return getRole(); - case MAIL: - return getMail(); + case TOKEN: + return getToken(); case UNIVERSITY: return getUniversity(); - case ROLE: - return getRole(); + case USER_ID: + return getUserID(); } throw new IllegalStateException(); @@ -40755,20 +42551,16 @@ public class Server { } switch (field) { - case LECTURENAME: - return isSetLecturename(); - case USERNAME: - return isSetUsername(); - case LAST_NAME: - return isSetLastName(); - case FIRST_NAME: - return isSetFirstName(); - case MAIL: - return isSetMail(); - case UNIVERSITY: - return isSetUniversity(); + case LECTURE_ID: + return isSetLectureID(); case ROLE: return isSetRole(); + case TOKEN: + return isSetToken(); + case UNIVERSITY: + return isSetUniversity(); + case USER_ID: + return isSetUserID(); } throw new IllegalStateException(); } @@ -40786,48 +42578,30 @@ public class Server { if (that == null) return false; - boolean this_present_lecturename = true && this.isSetLecturename(); - boolean that_present_lecturename = true && that.isSetLecturename(); - if (this_present_lecturename || that_present_lecturename) { - if (!(this_present_lecturename && that_present_lecturename)) - return false; - if (!this.lecturename.equals(that.lecturename)) - return false; - } - - boolean this_present_username = true && this.isSetUsername(); - boolean that_present_username = true && that.isSetUsername(); - if (this_present_username || that_present_username) { - if (!(this_present_username && that_present_username)) - return false; - if (!this.username.equals(that.username)) - return false; - } - - boolean this_present_lastName = true && this.isSetLastName(); - boolean that_present_lastName = true && that.isSetLastName(); - if (this_present_lastName || that_present_lastName) { - if (!(this_present_lastName && that_present_lastName)) + boolean this_present_lectureID = true && this.isSetLectureID(); + boolean that_present_lectureID = true && that.isSetLectureID(); + if (this_present_lectureID || that_present_lectureID) { + if (!(this_present_lectureID && that_present_lectureID)) return false; - if (!this.lastName.equals(that.lastName)) + if (!this.lectureID.equals(that.lectureID)) return false; } - boolean this_present_firstName = true && this.isSetFirstName(); - boolean that_present_firstName = true && that.isSetFirstName(); - if (this_present_firstName || that_present_firstName) { - if (!(this_present_firstName && that_present_firstName)) + boolean this_present_role = true && this.isSetRole(); + boolean that_present_role = true && that.isSetRole(); + if (this_present_role || that_present_role) { + if (!(this_present_role && that_present_role)) return false; - if (!this.firstName.equals(that.firstName)) + if (!this.role.equals(that.role)) return false; } - boolean this_present_mail = true && this.isSetMail(); - boolean that_present_mail = true && that.isSetMail(); - if (this_present_mail || that_present_mail) { - if (!(this_present_mail && that_present_mail)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.mail.equals(that.mail)) + if (!this.token.equals(that.token)) return false; } @@ -40840,12 +42614,12 @@ public class Server { return false; } - boolean this_present_role = true && this.isSetRole(); - boolean that_present_role = true && that.isSetRole(); - if (this_present_role || that_present_role) { - if (!(this_present_role && that_present_role)) + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) return false; - if (!this.role.equals(that.role)) + if (!this.userID.equals(that.userID)) return false; } @@ -40865,52 +42639,32 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetLecturename()).compareTo(other.isSetLecturename()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLecturename()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lecturename, other.lecturename); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUsername()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); + lastComparison = Boolean.valueOf(isSetLectureID()).compareTo(other.isSetLectureID()); if (lastComparison != 0) { return lastComparison; } - if (isSetLastName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); + if (isSetLectureID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lectureID, other.lectureID); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); + lastComparison = Boolean.valueOf(isSetRole()).compareTo(other.isSetRole()); if (lastComparison != 0) { return lastComparison; } - if (isSetFirstName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); + if (isSetRole()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.role, other.role); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMail()).compareTo(other.isSetMail()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mail, other.mail); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -40925,12 +42679,12 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRole()).compareTo(other.isSetRole()); + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); if (lastComparison != 0) { return lastComparison; } - if (isSetRole()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.role, other.role); + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); if (lastComparison != 0) { return lastComparison; } @@ -40955,43 +42709,27 @@ public class Server { StringBuilder sb = new StringBuilder("writeLectureRights_args("); boolean first = true; - sb.append("lecturename:"); - if (this.lecturename == null) { - sb.append("null"); - } else { - sb.append(this.lecturename); - } - first = false; - if (!first) sb.append(", "); - sb.append("username:"); - if (this.username == null) { - sb.append("null"); - } else { - sb.append(this.username); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastName:"); - if (this.lastName == null) { + sb.append("lectureID:"); + if (this.lectureID == null) { sb.append("null"); } else { - sb.append(this.lastName); + sb.append(this.lectureID); } first = false; if (!first) sb.append(", "); - sb.append("firstName:"); - if (this.firstName == null) { + sb.append("role:"); + if (this.role == null) { sb.append("null"); } else { - sb.append(this.firstName); + sb.append(this.role); } first = false; if (!first) sb.append(", "); - sb.append("mail:"); - if (this.mail == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.mail); + sb.append(this.token); } first = false; if (!first) sb.append(", "); @@ -41003,11 +42741,11 @@ public class Server { } first = false; if (!first) sb.append(", "); - sb.append("role:"); - if (this.role == null) { + sb.append("userID:"); + if (this.userID == null) { sb.append("null"); } else { - sb.append(this.role); + sb.append(this.userID); } first = false; sb.append(")"); @@ -41053,47 +42791,31 @@ public class Server { break; } switch (schemeField.id) { - case 1: // LECTURENAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lecturename = iprot.readString(); - struct.setLecturenameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // USERNAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.username = iprot.readString(); - struct.setUsernameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // LAST_NAME + case 1: // LECTURE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.lastName = iprot.readString(); - struct.setLastNameIsSet(true); + struct.lectureID = iprot.readString(); + struct.setLectureIDIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // FIRST_NAME + case 2: // ROLE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.firstName = iprot.readString(); - struct.setFirstNameIsSet(true); + struct.role = iprot.readString(); + struct.setRoleIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // MAIL + case 3: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // UNIVERSITY + case 4: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -41101,10 +42823,10 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // ROLE + case 5: // USER_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.role = iprot.readString(); - struct.setRoleIsSet(true); + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -41124,29 +42846,19 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.lecturename != null) { - oprot.writeFieldBegin(LECTURENAME_FIELD_DESC); - oprot.writeString(struct.lecturename); - oprot.writeFieldEnd(); - } - if (struct.username != null) { - oprot.writeFieldBegin(USERNAME_FIELD_DESC); - oprot.writeString(struct.username); - oprot.writeFieldEnd(); - } - if (struct.lastName != null) { - oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); - oprot.writeString(struct.lastName); + if (struct.lectureID != null) { + oprot.writeFieldBegin(LECTURE_ID_FIELD_DESC); + oprot.writeString(struct.lectureID); oprot.writeFieldEnd(); } - if (struct.firstName != null) { - oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); - oprot.writeString(struct.firstName); + if (struct.role != null) { + oprot.writeFieldBegin(ROLE_FIELD_DESC); + oprot.writeString(struct.role); oprot.writeFieldEnd(); } - if (struct.mail != null) { - oprot.writeFieldBegin(MAIL_FIELD_DESC); - oprot.writeString(struct.mail); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } if (struct.university != null) { @@ -41154,9 +42866,9 @@ public class Server { oprot.writeString(struct.university); oprot.writeFieldEnd(); } - if (struct.role != null) { - oprot.writeFieldBegin(ROLE_FIELD_DESC); - oprot.writeString(struct.role); + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -41177,82 +42889,62 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, writeLectureRights_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetLecturename()) { + if (struct.isSetLectureID()) { optionals.set(0); } - if (struct.isSetUsername()) { + if (struct.isSetRole()) { optionals.set(1); } - if (struct.isSetLastName()) { + if (struct.isSetToken()) { optionals.set(2); } - if (struct.isSetFirstName()) { + if (struct.isSetUniversity()) { optionals.set(3); } - if (struct.isSetMail()) { + if (struct.isSetUserID()) { optionals.set(4); } - if (struct.isSetUniversity()) { - optionals.set(5); + oprot.writeBitSet(optionals, 5); + if (struct.isSetLectureID()) { + oprot.writeString(struct.lectureID); } if (struct.isSetRole()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); - if (struct.isSetLecturename()) { - oprot.writeString(struct.lecturename); - } - if (struct.isSetUsername()) { - oprot.writeString(struct.username); - } - if (struct.isSetLastName()) { - oprot.writeString(struct.lastName); - } - if (struct.isSetFirstName()) { - oprot.writeString(struct.firstName); + oprot.writeString(struct.role); } - if (struct.isSetMail()) { - oprot.writeString(struct.mail); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetUniversity()) { oprot.writeString(struct.university); } - if (struct.isSetRole()) { - oprot.writeString(struct.role); + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeLectureRights_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(7); + BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { - struct.lecturename = iprot.readString(); - struct.setLecturenameIsSet(true); + struct.lectureID = iprot.readString(); + struct.setLectureIDIsSet(true); } if (incoming.get(1)) { - struct.username = iprot.readString(); - struct.setUsernameIsSet(true); + struct.role = iprot.readString(); + struct.setRoleIsSet(true); } if (incoming.get(2)) { - struct.lastName = iprot.readString(); - struct.setLastNameIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(3)) { - struct.firstName = iprot.readString(); - struct.setFirstNameIsSet(true); - } - if (incoming.get(4)) { - struct.mail = iprot.readString(); - struct.setMailIsSet(true); - } - if (incoming.get(5)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } - if (incoming.get(6)) { - struct.role = iprot.readString(); - struct.setRoleIsSet(true); + if (incoming.get(4)) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } } } @@ -41621,6 +43313,7 @@ public class Server { private static final org.apache.thrift.protocol.TField IS_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("isRead", org.apache.thrift.protocol.TType.BOOL, (short)3); private static final org.apache.thrift.protocol.TField IS_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("isWrite", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final org.apache.thrift.protocol.TField IS_ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("isAdmin", org.apache.thrift.protocol.TType.BOOL, (short)5); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -41633,6 +43326,7 @@ public class Server { public boolean isRead; // required public boolean isWrite; // required public boolean isAdmin; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -41640,7 +43334,8 @@ public class Server { USER_ID((short)2, "userID"), IS_READ((short)3, "isRead"), IS_WRITE((short)4, "isWrite"), - IS_ADMIN((short)5, "isAdmin"); + IS_ADMIN((short)5, "isAdmin"), + TOKEN((short)6, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -41665,6 +43360,8 @@ public class Server { return IS_WRITE; case 5: // IS_ADMIN return IS_ADMIN; + case 6: // TOKEN + return TOKEN; default: return null; } @@ -41722,6 +43419,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.IS_ADMIN, new org.apache.thrift.meta_data.FieldMetaData("isAdmin", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeAdditionalLectureRights_args.class, metaDataMap); } @@ -41734,7 +43433,8 @@ public class Server { String userID, boolean isRead, boolean isWrite, - boolean isAdmin) + boolean isAdmin, + String token) { this(); this.lectureName = lectureName; @@ -41745,6 +43445,7 @@ public class Server { setIsWriteIsSet(true); this.isAdmin = isAdmin; setIsAdminIsSet(true); + this.token = token; } /** @@ -41761,6 +43462,9 @@ public class Server { this.isRead = other.isRead; this.isWrite = other.isWrite; this.isAdmin = other.isAdmin; + if (other.isSetToken()) { + this.token = other.token; + } } public writeAdditionalLectureRights_args deepCopy() { @@ -41777,6 +43481,7 @@ public class Server { this.isWrite = false; setIsAdminIsSet(false); this.isAdmin = false; + this.token = null; } public String getLectureName() { @@ -41896,6 +43601,30 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISADMIN_ISSET_ID, value); } + public String getToken() { + return this.token; + } + + public writeAdditionalLectureRights_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case LECTURE_NAME: @@ -41938,6 +43667,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -41958,6 +43695,9 @@ public class Server { case IS_ADMIN: return Boolean.valueOf(isIsAdmin()); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -41979,6 +43719,8 @@ public class Server { return isSetIsWrite(); case IS_ADMIN: return isSetIsAdmin(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -42041,6 +43783,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -42107,6 +43858,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -42154,6 +43915,14 @@ public class Server { sb.append("isAdmin:"); sb.append(this.isAdmin); first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -42239,6 +44008,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -42273,6 +44050,11 @@ public class Server { oprot.writeFieldBegin(IS_ADMIN_FIELD_DESC); oprot.writeBool(struct.isAdmin); oprot.writeFieldEnd(); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -42306,7 +44088,10 @@ public class Server { if (struct.isSetIsAdmin()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetToken()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetLectureName()) { oprot.writeString(struct.lectureName); } @@ -42322,12 +44107,15 @@ public class Server { if (struct.isSetIsAdmin()) { oprot.writeBool(struct.isAdmin); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeAdditionalLectureRights_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.lectureName = iprot.readString(); struct.setLectureNameIsSet(true); @@ -42348,6 +44136,10 @@ public class Server { struct.isAdmin = iprot.readBool(); struct.setIsAdminIsSet(true); } + if (incoming.get(5)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -42711,6 +44503,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllOtherSatelliteUsers_args"); private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.LIST, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -42719,10 +44512,12 @@ public class Server { } public List<String> userID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"); + USER_ID((short)1, "userID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -42739,6 +44534,8 @@ public class Server { switch(fieldId) { case 1: // USER_ID return USER_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -42785,6 +44582,8 @@ public class Server { tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllOtherSatelliteUsers_args.class, metaDataMap); } @@ -42793,10 +44592,12 @@ public class Server { } public getAllOtherSatelliteUsers_args( - List<String> userID) + List<String> userID, + String token) { this(); this.userID = userID; + this.token = token; } /** @@ -42807,6 +44608,9 @@ public class Server { List<String> __this__userID = new ArrayList<String>(other.userID); this.userID = __this__userID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getAllOtherSatelliteUsers_args deepCopy() { @@ -42816,6 +44620,7 @@ public class Server { @Override public void clear() { this.userID = null; + this.token = null; } public int getUserIDSize() { @@ -42857,6 +44662,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getAllOtherSatelliteUsers_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER_ID: @@ -42867,6 +44696,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -42875,6 +44712,9 @@ public class Server { case USER_ID: return getUserID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -42888,6 +44728,8 @@ public class Server { switch (field) { case USER_ID: return isSetUserID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -42914,6 +44756,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -42940,6 +44791,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -42967,6 +44828,14 @@ public class Server { sb.append(this.userID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -43028,6 +44897,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -43055,6 +44932,11 @@ public class Server { } oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -43076,7 +44958,10 @@ public class Server { if (struct.isSetUserID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { { oprot.writeI32(struct.userID.size()); @@ -43086,12 +44971,15 @@ public class Server { } } } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getAllOtherSatelliteUsers_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { org.apache.thrift.protocol.TList _list141 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); @@ -43105,6 +44993,10 @@ public class Server { } struct.setUserIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -43521,8 +45413,9 @@ public class Server { public static class getPermissionForUserAndImage_args implements org.apache.thrift.TBase<getPermissionForUserAndImage_args, getPermissionForUserAndImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPermissionForUserAndImage_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPermissionForUserAndImage_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageID", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -43530,13 +45423,15 @@ public class Server { schemes.put(TupleScheme.class, new getPermissionForUserAndImage_argsTupleSchemeFactory()); } - public String userID; // required + public String token; // required public String imageID; // required + public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"), - IMAGE_ID((short)2, "imageID"); + TOKEN((short)1, "token"), + IMAGE_ID((short)2, "imageID"), + USER_ID((short)3, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -43551,10 +45446,12 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; + case 1: // TOKEN + return TOKEN; case 2: // IMAGE_ID return IMAGE_ID; + case 3: // USER_ID + return USER_ID; default: return null; } @@ -43598,10 +45495,12 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPermissionForUserAndImage_args.class, metaDataMap); } @@ -43610,24 +45509,29 @@ public class Server { } public getPermissionForUserAndImage_args( - String userID, - String imageID) + String token, + String imageID, + String userID) { this(); - this.userID = userID; + this.token = token; this.imageID = imageID; + this.userID = userID; } /** * Performs a deep copy on <i>other</i>. */ public getPermissionForUserAndImage_args(getPermissionForUserAndImage_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetImageID()) { this.imageID = other.imageID; } + if (other.isSetUserID()) { + this.userID = other.userID; + } } public getPermissionForUserAndImage_args deepCopy() { @@ -43636,31 +45540,32 @@ public class Server { @Override public void clear() { - this.userID = null; + this.token = null; this.imageID = null; + this.userID = null; } - public String getUserID() { - return this.userID; + public String getToken() { + return this.token; } - public getPermissionForUserAndImage_args setUserID(String userID) { - this.userID = userID; + public getPermissionForUserAndImage_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } @@ -43688,13 +45593,37 @@ public class Server { } } + public String getUserID() { + return this.userID; + } + + public getPermissionForUserAndImage_args setUserID(String userID) { + this.userID = userID; + return this; + } + + public void unsetUserID() { + this.userID = null; + } + + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; + } + + public void setUserIDIsSet(boolean value) { + if (!value) { + this.userID = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case TOKEN: if (value == null) { - unsetUserID(); + unsetToken(); } else { - setUserID((String)value); + setToken((String)value); } break; @@ -43706,17 +45635,28 @@ public class Server { } break; + case USER_ID: + if (value == null) { + unsetUserID(); + } else { + setUserID((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); + case TOKEN: + return getToken(); case IMAGE_ID: return getImageID(); + case USER_ID: + return getUserID(); + } throw new IllegalStateException(); } @@ -43728,10 +45668,12 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); + case TOKEN: + return isSetToken(); case IMAGE_ID: return isSetImageID(); + case USER_ID: + return isSetUserID(); } throw new IllegalStateException(); } @@ -43749,12 +45691,12 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.userID.equals(that.userID)) + if (!this.token.equals(that.token)) return false; } @@ -43767,6 +45709,15 @@ public class Server { return false; } + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) + return false; + if (!this.userID.equals(that.userID)) + return false; + } + return true; } @@ -43783,12 +45734,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -43803,6 +45754,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -43823,11 +45784,11 @@ public class Server { StringBuilder sb = new StringBuilder("getPermissionForUserAndImage_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.token); } first = false; if (!first) sb.append(", "); @@ -43838,6 +45799,14 @@ public class Server { sb.append(this.imageID); } first = false; + if (!first) sb.append(", "); + sb.append("userID:"); + if (this.userID == null) { + sb.append("null"); + } else { + sb.append(this.userID); + } + first = false; sb.append(")"); return sb.toString(); } @@ -43881,10 +45850,10 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -43897,6 +45866,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // USER_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -43912,9 +45889,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } if (struct.imageID != null) { @@ -43922,6 +45899,11 @@ public class Server { oprot.writeString(struct.imageID); oprot.writeFieldEnd(); } + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -43940,33 +45922,43 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getPermissionForUserAndImage_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(0); } if (struct.isSetImageID()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetImageID()) { oprot.writeString(struct.imageID); } + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPermissionForUserAndImage_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(1)) { struct.imageID = iprot.readString(); struct.setImageIDIsSet(true); } + if (incoming.get(2)) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } } } @@ -44384,6 +46376,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAdditionalImageContacts_args"); private static final org.apache.thrift.protocol.TField IMAGE_ID_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 TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -44392,10 +46385,12 @@ public class Server { } public String imageID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IMAGE_ID((short)1, "imageID"); + IMAGE_ID((short)1, "imageID"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -44412,6 +46407,8 @@ public class Server { switch(fieldId) { case 1: // IMAGE_ID return IMAGE_ID; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -44457,6 +46454,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAdditionalImageContacts_args.class, metaDataMap); } @@ -44465,10 +46464,12 @@ public class Server { } public getAdditionalImageContacts_args( - String imageID) + String imageID, + String token) { this(); this.imageID = imageID; + this.token = token; } /** @@ -44478,6 +46479,9 @@ public class Server { if (other.isSetImageID()) { this.imageID = other.imageID; } + if (other.isSetToken()) { + this.token = other.token; + } } public getAdditionalImageContacts_args deepCopy() { @@ -44487,6 +46491,7 @@ public class Server { @Override public void clear() { this.imageID = null; + this.token = null; } public String getImageID() { @@ -44513,6 +46518,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getAdditionalImageContacts_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGE_ID: @@ -44523,6 +46552,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -44531,6 +46568,9 @@ public class Server { case IMAGE_ID: return getImageID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -44544,6 +46584,8 @@ public class Server { switch (field) { case IMAGE_ID: return isSetImageID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -44570,6 +46612,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -44596,6 +46647,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -44623,6 +46684,14 @@ public class Server { sb.append(this.imageID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -44674,6 +46743,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -44694,6 +46771,11 @@ public class Server { oprot.writeString(struct.imageID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -44715,20 +46797,30 @@ public class Server { if (struct.isSetImageID()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetImageID()) { oprot.writeString(struct.imageID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getAdditionalImageContacts_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.imageID = iprot.readString(); struct.setImageIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -45140,8 +47232,9 @@ public class Server { public static class getPermissionForUserAndLecture_args implements org.apache.thrift.TBase<getPermissionForUserAndLecture_args, getPermissionForUserAndLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPermissionForUserAndLecture_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPermissionForUserAndLecture_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureID", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -45149,13 +47242,15 @@ public class Server { schemes.put(TupleScheme.class, new getPermissionForUserAndLecture_argsTupleSchemeFactory()); } - public String userID; // required + public String token; // required public String lectureID; // required + public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"), - LECTURE_ID((short)2, "lectureID"); + TOKEN((short)1, "token"), + LECTURE_ID((short)2, "lectureID"), + USER_ID((short)3, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -45170,10 +47265,12 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; + case 1: // TOKEN + return TOKEN; case 2: // LECTURE_ID return LECTURE_ID; + case 3: // USER_ID + return USER_ID; default: return null; } @@ -45217,10 +47314,12 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPermissionForUserAndLecture_args.class, metaDataMap); } @@ -45229,24 +47328,29 @@ public class Server { } public getPermissionForUserAndLecture_args( - String userID, - String lectureID) + String token, + String lectureID, + String userID) { this(); - this.userID = userID; + this.token = token; this.lectureID = lectureID; + this.userID = userID; } /** * Performs a deep copy on <i>other</i>. */ public getPermissionForUserAndLecture_args(getPermissionForUserAndLecture_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; + if (other.isSetToken()) { + this.token = other.token; } if (other.isSetLectureID()) { this.lectureID = other.lectureID; } + if (other.isSetUserID()) { + this.userID = other.userID; + } } public getPermissionForUserAndLecture_args deepCopy() { @@ -45255,31 +47359,32 @@ public class Server { @Override public void clear() { - this.userID = null; + this.token = null; this.lectureID = null; + this.userID = null; } - public String getUserID() { - return this.userID; + public String getToken() { + return this.token; } - public getPermissionForUserAndLecture_args setUserID(String userID) { - this.userID = userID; + public getPermissionForUserAndLecture_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } @@ -45307,13 +47412,37 @@ public class Server { } } + public String getUserID() { + return this.userID; + } + + public getPermissionForUserAndLecture_args setUserID(String userID) { + this.userID = userID; + return this; + } + + public void unsetUserID() { + this.userID = null; + } + + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; + } + + public void setUserIDIsSet(boolean value) { + if (!value) { + this.userID = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case TOKEN: if (value == null) { - unsetUserID(); + unsetToken(); } else { - setUserID((String)value); + setToken((String)value); } break; @@ -45325,17 +47454,28 @@ public class Server { } break; + case USER_ID: + if (value == null) { + unsetUserID(); + } else { + setUserID((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); + case TOKEN: + return getToken(); case LECTURE_ID: return getLectureID(); + case USER_ID: + return getUserID(); + } throw new IllegalStateException(); } @@ -45347,10 +47487,12 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); + case TOKEN: + return isSetToken(); case LECTURE_ID: return isSetLectureID(); + case USER_ID: + return isSetUserID(); } throw new IllegalStateException(); } @@ -45368,12 +47510,12 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) return false; - if (!this.userID.equals(that.userID)) + if (!this.token.equals(that.token)) return false; } @@ -45386,6 +47528,15 @@ public class Server { return false; } + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) + return false; + if (!this.userID.equals(that.userID)) + return false; + } + return true; } @@ -45402,12 +47553,12 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -45422,6 +47573,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -45442,11 +47603,11 @@ public class Server { StringBuilder sb = new StringBuilder("getPermissionForUserAndLecture_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.token); } first = false; if (!first) sb.append(", "); @@ -45457,6 +47618,14 @@ public class Server { sb.append(this.lectureID); } first = false; + if (!first) sb.append(", "); + sb.append("userID:"); + if (this.userID == null) { + sb.append("null"); + } else { + sb.append(this.userID); + } + first = false; sb.append(")"); return sb.toString(); } @@ -45500,10 +47669,10 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -45516,6 +47685,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // USER_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -45531,9 +47708,9 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); oprot.writeFieldEnd(); } if (struct.lectureID != null) { @@ -45541,6 +47718,11 @@ public class Server { oprot.writeString(struct.lectureID); oprot.writeFieldEnd(); } + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -45559,33 +47741,43 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getPermissionForUserAndLecture_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(0); } if (struct.isSetLectureID()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetToken()) { + oprot.writeString(struct.token); } if (struct.isSetLectureID()) { oprot.writeString(struct.lectureID); } + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPermissionForUserAndLecture_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); } if (incoming.get(1)) { struct.lectureID = iprot.readString(); struct.setLectureIDIsSet(true); } + if (incoming.get(2)) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } } } @@ -46003,7 +48195,8 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllAdditionalImagePermissions_args"); private static final org.apache.thrift.protocol.TField IMAGE_ID_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 USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -46012,12 +48205,14 @@ public class Server { } public String imageID; // required + public String token; // required public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { IMAGE_ID((short)1, "imageID"), - USER_ID((short)2, "userID"); + TOKEN((short)2, "token"), + USER_ID((short)3, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -46034,7 +48229,9 @@ public class Server { switch(fieldId) { case 1: // IMAGE_ID return IMAGE_ID; - case 2: // USER_ID + case 2: // TOKEN + return TOKEN; + case 3: // USER_ID return USER_ID; default: return null; @@ -46081,6 +48278,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -46092,10 +48291,12 @@ public class Server { public deleteAllAdditionalImagePermissions_args( String imageID, + String token, String userID) { this(); this.imageID = imageID; + this.token = token; this.userID = userID; } @@ -46106,6 +48307,9 @@ public class Server { if (other.isSetImageID()) { this.imageID = other.imageID; } + if (other.isSetToken()) { + this.token = other.token; + } if (other.isSetUserID()) { this.userID = other.userID; } @@ -46118,6 +48322,7 @@ public class Server { @Override public void clear() { this.imageID = null; + this.token = null; this.userID = null; } @@ -46145,6 +48350,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public deleteAllAdditionalImagePermissions_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public String getUserID() { return this.userID; } @@ -46179,6 +48408,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + case USER_ID: if (value == null) { unsetUserID(); @@ -46195,6 +48432,9 @@ public class Server { case IMAGE_ID: return getImageID(); + case TOKEN: + return getToken(); + case USER_ID: return getUserID(); @@ -46211,6 +48451,8 @@ public class Server { switch (field) { case IMAGE_ID: return isSetImageID(); + case TOKEN: + return isSetToken(); case USER_ID: return isSetUserID(); } @@ -46239,6 +48481,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + boolean this_present_userID = true && this.isSetUserID(); boolean that_present_userID = true && that.isSetUserID(); if (this_present_userID || that_present_userID) { @@ -46274,6 +48525,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); if (lastComparison != 0) { return lastComparison; @@ -46312,6 +48573,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; + if (!first) sb.append(", "); sb.append("userID:"); if (this.userID == null) { sb.append("null"); @@ -46370,7 +48639,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // USER_ID + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // USER_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); @@ -46398,6 +48675,11 @@ public class Server { oprot.writeString(struct.imageID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } if (struct.userID != null) { oprot.writeFieldBegin(USER_ID_FIELD_DESC); oprot.writeString(struct.userID); @@ -46424,13 +48706,19 @@ public class Server { if (struct.isSetImageID()) { optionals.set(0); } - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetUserID()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetImageID()) { oprot.writeString(struct.imageID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } if (struct.isSetUserID()) { oprot.writeString(struct.userID); } @@ -46439,12 +48727,16 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, deleteAllAdditionalImagePermissions_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.imageID = iprot.readString(); struct.setImageIDIsSet(true); } if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } + if (incoming.get(2)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); } @@ -46703,7 +48995,8 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllAdditionalLecturePermissions_args"); private static final org.apache.thrift.protocol.TField LECTURE_ID_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 USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -46712,12 +49005,14 @@ public class Server { } public String lectureID; // required + public String token; // required public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { LECTURE_ID((short)1, "lectureID"), - USER_ID((short)2, "userID"); + TOKEN((short)2, "token"), + USER_ID((short)3, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -46734,7 +49029,9 @@ public class Server { switch(fieldId) { case 1: // LECTURE_ID return LECTURE_ID; - case 2: // USER_ID + case 2: // TOKEN + return TOKEN; + case 3: // USER_ID return USER_ID; default: return null; @@ -46781,6 +49078,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -46792,10 +49091,12 @@ public class Server { public deleteAllAdditionalLecturePermissions_args( String lectureID, + String token, String userID) { this(); this.lectureID = lectureID; + this.token = token; this.userID = userID; } @@ -46806,6 +49107,9 @@ public class Server { if (other.isSetLectureID()) { this.lectureID = other.lectureID; } + if (other.isSetToken()) { + this.token = other.token; + } if (other.isSetUserID()) { this.userID = other.userID; } @@ -46818,6 +49122,7 @@ public class Server { @Override public void clear() { this.lectureID = null; + this.token = null; this.userID = null; } @@ -46845,6 +49150,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public deleteAllAdditionalLecturePermissions_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public String getUserID() { return this.userID; } @@ -46879,6 +49208,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + case USER_ID: if (value == null) { unsetUserID(); @@ -46895,6 +49232,9 @@ public class Server { case LECTURE_ID: return getLectureID(); + case TOKEN: + return getToken(); + case USER_ID: return getUserID(); @@ -46911,6 +49251,8 @@ public class Server { switch (field) { case LECTURE_ID: return isSetLectureID(); + case TOKEN: + return isSetToken(); case USER_ID: return isSetUserID(); } @@ -46939,6 +49281,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + boolean this_present_userID = true && this.isSetUserID(); boolean that_present_userID = true && that.isSetUserID(); if (this_present_userID || that_present_userID) { @@ -46974,6 +49325,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); if (lastComparison != 0) { return lastComparison; @@ -47012,6 +49373,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; + if (!first) sb.append(", "); sb.append("userID:"); if (this.userID == null) { sb.append("null"); @@ -47070,7 +49439,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // USER_ID + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // USER_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); @@ -47098,6 +49475,11 @@ public class Server { oprot.writeString(struct.lectureID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } if (struct.userID != null) { oprot.writeFieldBegin(USER_ID_FIELD_DESC); oprot.writeString(struct.userID); @@ -47124,13 +49506,19 @@ public class Server { if (struct.isSetLectureID()) { optionals.set(0); } - if (struct.isSetUserID()) { + if (struct.isSetToken()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetUserID()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetLectureID()) { oprot.writeString(struct.lectureID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } if (struct.isSetUserID()) { oprot.writeString(struct.userID); } @@ -47139,12 +49527,16 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, deleteAllAdditionalLecturePermissions_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.lectureID = iprot.readString(); struct.setLectureIDIsSet(true); } if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } + if (incoming.get(2)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); } @@ -47403,6 +49795,7 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOsNameForGuestOs_args"); private static final org.apache.thrift.protocol.TField GUEST_OS_FIELD_DESC = new org.apache.thrift.protocol.TField("guestOS", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -47411,10 +49804,12 @@ public class Server { } public String guestOS; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - GUEST_OS((short)1, "guestOS"); + GUEST_OS((short)1, "guestOS"), + TOKEN((short)2, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -47431,6 +49826,8 @@ public class Server { switch(fieldId) { case 1: // GUEST_OS return GUEST_OS; + case 2: // TOKEN + return TOKEN; default: return null; } @@ -47476,6 +49873,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.GUEST_OS, new org.apache.thrift.meta_data.FieldMetaData("guestOS", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOsNameForGuestOs_args.class, metaDataMap); } @@ -47484,10 +49883,12 @@ public class Server { } public getOsNameForGuestOs_args( - String guestOS) + String guestOS, + String token) { this(); this.guestOS = guestOS; + this.token = token; } /** @@ -47497,6 +49898,9 @@ public class Server { if (other.isSetGuestOS()) { this.guestOS = other.guestOS; } + if (other.isSetToken()) { + this.token = other.token; + } } public getOsNameForGuestOs_args deepCopy() { @@ -47506,6 +49910,7 @@ public class Server { @Override public void clear() { this.guestOS = null; + this.token = null; } public String getGuestOS() { @@ -47532,6 +49937,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public getOsNameForGuestOs_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case GUEST_OS: @@ -47542,6 +49971,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -47550,6 +49987,9 @@ public class Server { case GUEST_OS: return getGuestOS(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -47563,6 +50003,8 @@ public class Server { switch (field) { case GUEST_OS: return isSetGuestOS(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -47589,6 +50031,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -47615,6 +50066,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -47642,6 +50103,14 @@ public class Server { sb.append(this.guestOS); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -47693,6 +50162,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -47713,6 +50190,11 @@ public class Server { oprot.writeString(struct.guestOS); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -47734,20 +50216,30 @@ public class Server { if (struct.isSetGuestOS()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); if (struct.isSetGuestOS()) { oprot.writeString(struct.guestOS); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getOsNameForGuestOs_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.guestOS = iprot.readString(); struct.setGuestOSIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -48110,8 +50602,9 @@ public class Server { public static class userIsImageAdmin_args implements org.apache.thrift.TBase<userIsImageAdmin_args, userIsImageAdmin_args._Fields>, java.io.Serializable, Cloneable, Comparable<userIsImageAdmin_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("userIsImageAdmin_args"); - private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageID", 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("imageID", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -48119,13 +50612,15 @@ public class Server { schemes.put(TupleScheme.class, new userIsImageAdmin_argsTupleSchemeFactory()); } - public String userID; // required public String imageID; // required + public String token; // required + public String userID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - USER_ID((short)1, "userID"), - IMAGE_ID((short)2, "imageID"); + IMAGE_ID((short)1, "imageID"), + TOKEN((short)2, "token"), + USER_ID((short)3, "userID"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -48140,10 +50635,12 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USER_ID - return USER_ID; - case 2: // IMAGE_ID + case 1: // IMAGE_ID return IMAGE_ID; + case 2: // TOKEN + return TOKEN; + case 3: // USER_ID + return USER_ID; default: return null; } @@ -48187,10 +50684,12 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userID", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(userIsImageAdmin_args.class, metaDataMap); } @@ -48199,24 +50698,29 @@ public class Server { } public userIsImageAdmin_args( - String userID, - String imageID) + String imageID, + String token, + String userID) { this(); - this.userID = userID; this.imageID = imageID; + this.token = token; + this.userID = userID; } /** * Performs a deep copy on <i>other</i>. */ public userIsImageAdmin_args(userIsImageAdmin_args other) { - if (other.isSetUserID()) { - this.userID = other.userID; - } if (other.isSetImageID()) { this.imageID = other.imageID; } + if (other.isSetToken()) { + this.token = other.token; + } + if (other.isSetUserID()) { + this.userID = other.userID; + } } public userIsImageAdmin_args deepCopy() { @@ -48225,73 +50729,106 @@ public class Server { @Override public void clear() { + this.imageID = null; + this.token = null; this.userID = null; + } + + public String getImageID() { + return this.imageID; + } + + public userIsImageAdmin_args setImageID(String imageID) { + this.imageID = imageID; + return this; + } + + public void unsetImageID() { this.imageID = null; } - public String getUserID() { - return this.userID; + /** Returns true if field imageID is set (has been assigned a value) and false otherwise */ + public boolean isSetImageID() { + return this.imageID != null; } - public userIsImageAdmin_args setUserID(String userID) { - this.userID = userID; + public void setImageIDIsSet(boolean value) { + if (!value) { + this.imageID = null; + } + } + + public String getToken() { + return this.token; + } + + public userIsImageAdmin_args setToken(String token) { + this.token = token; return this; } - public void unsetUserID() { - this.userID = null; + public void unsetToken() { + this.token = null; } - /** Returns true if field userID is set (has been assigned a value) and false otherwise */ - public boolean isSetUserID() { - return this.userID != null; + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; } - public void setUserIDIsSet(boolean value) { + public void setTokenIsSet(boolean value) { if (!value) { - this.userID = null; + this.token = null; } } - public String getImageID() { - return this.imageID; + public String getUserID() { + return this.userID; } - public userIsImageAdmin_args setImageID(String imageID) { - this.imageID = imageID; + public userIsImageAdmin_args setUserID(String userID) { + this.userID = userID; return this; } - public void unsetImageID() { - this.imageID = null; + public void unsetUserID() { + this.userID = null; } - /** Returns true if field imageID is set (has been assigned a value) and false otherwise */ - public boolean isSetImageID() { - return this.imageID != null; + /** Returns true if field userID is set (has been assigned a value) and false otherwise */ + public boolean isSetUserID() { + return this.userID != null; } - public void setImageIDIsSet(boolean value) { + public void setUserIDIsSet(boolean value) { if (!value) { - this.imageID = null; + this.userID = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case USER_ID: + case IMAGE_ID: if (value == null) { - unsetUserID(); + unsetImageID(); } else { - setUserID((String)value); + setImageID((String)value); } break; - case IMAGE_ID: + case TOKEN: if (value == null) { - unsetImageID(); + unsetToken(); } else { - setImageID((String)value); + setToken((String)value); + } + break; + + case USER_ID: + if (value == null) { + unsetUserID(); + } else { + setUserID((String)value); } break; @@ -48300,12 +50837,15 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case USER_ID: - return getUserID(); - case IMAGE_ID: return getImageID(); + case TOKEN: + return getToken(); + + case USER_ID: + return getUserID(); + } throw new IllegalStateException(); } @@ -48317,10 +50857,12 @@ public class Server { } switch (field) { - case USER_ID: - return isSetUserID(); case IMAGE_ID: return isSetImageID(); + case TOKEN: + return isSetToken(); + case USER_ID: + return isSetUserID(); } throw new IllegalStateException(); } @@ -48338,15 +50880,6 @@ public class Server { if (that == null) return false; - boolean this_present_userID = true && this.isSetUserID(); - boolean that_present_userID = true && that.isSetUserID(); - if (this_present_userID || that_present_userID) { - if (!(this_present_userID && that_present_userID)) - return false; - if (!this.userID.equals(that.userID)) - return false; - } - boolean this_present_imageID = true && this.isSetImageID(); boolean that_present_imageID = true && that.isSetImageID(); if (this_present_imageID || that_present_imageID) { @@ -48356,6 +50889,24 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + + boolean this_present_userID = true && this.isSetUserID(); + boolean that_present_userID = true && that.isSetUserID(); + if (this_present_userID || that_present_userID) { + if (!(this_present_userID && that_present_userID)) + return false; + if (!this.userID.equals(that.userID)) + return false; + } + return true; } @@ -48372,22 +50923,32 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + lastComparison = Boolean.valueOf(isSetImageID()).compareTo(other.isSetImageID()); if (lastComparison != 0) { return lastComparison; } - if (isSetUserID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); + if (isSetImageID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageID, other.imageID); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImageID()).compareTo(other.isSetImageID()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } - if (isSetImageID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageID, other.imageID); + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetUserID()).compareTo(other.isSetUserID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUserID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userID, other.userID); if (lastComparison != 0) { return lastComparison; } @@ -48412,19 +50973,27 @@ public class Server { StringBuilder sb = new StringBuilder("userIsImageAdmin_args("); boolean first = true; - sb.append("userID:"); - if (this.userID == null) { + sb.append("imageID:"); + if (this.imageID == null) { sb.append("null"); } else { - sb.append(this.userID); + sb.append(this.imageID); } first = false; if (!first) sb.append(", "); - sb.append("imageID:"); - if (this.imageID == null) { + sb.append("token:"); + if (this.token == null) { sb.append("null"); } else { - sb.append(this.imageID); + sb.append(this.token); + } + first = false; + if (!first) sb.append(", "); + sb.append("userID:"); + if (this.userID == null) { + sb.append("null"); + } else { + sb.append(this.userID); } first = false; sb.append(")"); @@ -48470,18 +51039,26 @@ public class Server { break; } switch (schemeField.id) { - case 1: // USER_ID + case 1: // IMAGE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); + struct.imageID = iprot.readString(); + struct.setImageIDIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // IMAGE_ID + case 2: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.imageID = iprot.readString(); - struct.setImageIDIsSet(true); + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // USER_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -48501,16 +51078,21 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.userID != null) { - oprot.writeFieldBegin(USER_ID_FIELD_DESC); - oprot.writeString(struct.userID); - oprot.writeFieldEnd(); - } if (struct.imageID != null) { oprot.writeFieldBegin(IMAGE_ID_FIELD_DESC); oprot.writeString(struct.imageID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } + if (struct.userID != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userID); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -48529,33 +51111,43 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, userIsImageAdmin_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetUserID()) { + if (struct.isSetImageID()) { optionals.set(0); } - if (struct.isSetImageID()) { + if (struct.isSetToken()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); if (struct.isSetUserID()) { - oprot.writeString(struct.userID); + optionals.set(2); } + oprot.writeBitSet(optionals, 3); if (struct.isSetImageID()) { oprot.writeString(struct.imageID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } + if (struct.isSetUserID()) { + oprot.writeString(struct.userID); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, userIsImageAdmin_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.userID = iprot.readString(); - struct.setUserIDIsSet(true); - } - if (incoming.get(1)) { struct.imageID = iprot.readString(); struct.setImageIDIsSet(true); } + if (incoming.get(1)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } + if (incoming.get(2)) { + struct.userID = iprot.readString(); + struct.setUserIDIsSet(true); + } } } @@ -48920,6 +51512,7 @@ public class Server { private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userID", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureID", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -48929,11 +51522,13 @@ public class Server { public String userID; // required public String lectureID; // required + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { USER_ID((short)1, "userID"), - LECTURE_ID((short)2, "lectureID"); + LECTURE_ID((short)2, "lectureID"), + TOKEN((short)3, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -48952,6 +51547,8 @@ public class Server { return USER_ID; case 2: // LECTURE_ID return LECTURE_ID; + case 3: // TOKEN + return TOKEN; default: return null; } @@ -48999,6 +51596,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureID", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(userIsLectureAdmin_args.class, metaDataMap); } @@ -49008,11 +51607,13 @@ public class Server { public userIsLectureAdmin_args( String userID, - String lectureID) + String lectureID, + String token) { this(); this.userID = userID; this.lectureID = lectureID; + this.token = token; } /** @@ -49025,6 +51626,9 @@ public class Server { if (other.isSetLectureID()) { this.lectureID = other.lectureID; } + if (other.isSetToken()) { + this.token = other.token; + } } public userIsLectureAdmin_args deepCopy() { @@ -49035,6 +51639,7 @@ public class Server { public void clear() { this.userID = null; this.lectureID = null; + this.token = null; } public String getUserID() { @@ -49085,6 +51690,30 @@ public class Server { } } + public String getToken() { + return this.token; + } + + public userIsLectureAdmin_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case USER_ID: @@ -49103,6 +51732,14 @@ public class Server { } break; + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } @@ -49114,6 +51751,9 @@ public class Server { case LECTURE_ID: return getLectureID(); + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -49129,6 +51769,8 @@ public class Server { return isSetUserID(); case LECTURE_ID: return isSetLectureID(); + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -49164,6 +51806,15 @@ public class Server { return false; } + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -49200,6 +51851,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -49235,6 +51896,14 @@ public class Server { sb.append(this.lectureID); } first = false; + if (!first) sb.append(", "); + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -49294,6 +51963,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -49319,6 +51996,11 @@ public class Server { oprot.writeString(struct.lectureID); oprot.writeFieldEnd(); } + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -49343,19 +52025,25 @@ public class Server { if (struct.isSetLectureID()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetUserID()) { oprot.writeString(struct.userID); } if (struct.isSetLectureID()) { oprot.writeString(struct.lectureID); } + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, userIsLectureAdmin_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.userID = iprot.readString(); struct.setUserIDIsSet(true); @@ -49364,6 +52052,10 @@ public class Server { struct.lectureID = iprot.readString(); struct.setLectureIDIsSet(true); } + if (incoming.get(2)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -49726,6 +52418,7 @@ public class Server { public static class createRandomUUID_args implements org.apache.thrift.TBase<createRandomUUID_args, createRandomUUID_args._Fields>, java.io.Serializable, Cloneable, Comparable<createRandomUUID_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createRandomUUID_args"); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -49733,10 +52426,11 @@ public class Server { schemes.put(TupleScheme.class, new createRandomUUID_argsTupleSchemeFactory()); } + public String token; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { -; + TOKEN((short)1, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -49751,6 +52445,8 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { + case 1: // TOKEN + return TOKEN; default: return null; } @@ -49789,9 +52485,13 @@ public class Server { return _fieldName; } } + + // isset id assignments public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createRandomUUID_args.class, metaDataMap); } @@ -49799,10 +52499,20 @@ public class Server { public createRandomUUID_args() { } + public createRandomUUID_args( + String token) + { + this(); + this.token = token; + } + /** * Performs a deep copy on <i>other</i>. */ public createRandomUUID_args(createRandomUUID_args other) { + if (other.isSetToken()) { + this.token = other.token; + } } public createRandomUUID_args deepCopy() { @@ -49811,15 +52521,51 @@ public class Server { @Override public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public createRandomUUID_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } } public void setFieldValue(_Fields field, Object value) { switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + } } public Object getFieldValue(_Fields field) { switch (field) { + case TOKEN: + return getToken(); + } throw new IllegalStateException(); } @@ -49831,6 +52577,8 @@ public class Server { } switch (field) { + case TOKEN: + return isSetToken(); } throw new IllegalStateException(); } @@ -49848,6 +52596,15 @@ public class Server { if (that == null) return false; + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + return true; } @@ -49864,6 +52621,16 @@ public class Server { int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -49884,6 +52651,13 @@ public class Server { StringBuilder sb = new StringBuilder("createRandomUUID_args("); boolean first = true; + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; sb.append(")"); return sb.toString(); } @@ -49927,6 +52701,14 @@ public class Server { break; } switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -49942,6 +52724,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -49959,11 +52746,24 @@ public class Server { @Override public void write(org.apache.thrift.protocol.TProtocol prot, createRandomUUID_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, createRandomUUID_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } } } @@ -50323,4 +53123,712 @@ public class Server { } + public static class getInstitutionByID_args implements org.apache.thrift.TBase<getInstitutionByID_args, getInstitutionByID_args._Fields>, java.io.Serializable, Cloneable, Comparable<getInstitutionByID_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getInstitutionByID_args"); + + private static final org.apache.thrift.protocol.TField INSTITUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("institutionID", org.apache.thrift.protocol.TType.STRING, (short)1); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new getInstitutionByID_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new getInstitutionByID_argsTupleSchemeFactory()); + } + + public String institutionID; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + INSTITUTION_ID((short)1, "institutionID"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // INSTITUTION_ID + return INSTITUTION_ID; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.INSTITUTION_ID, new org.apache.thrift.meta_data.FieldMetaData("institutionID", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getInstitutionByID_args.class, metaDataMap); + } + + public getInstitutionByID_args() { + } + + public getInstitutionByID_args( + String institutionID) + { + this(); + this.institutionID = institutionID; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public getInstitutionByID_args(getInstitutionByID_args other) { + if (other.isSetInstitutionID()) { + this.institutionID = other.institutionID; + } + } + + public getInstitutionByID_args deepCopy() { + return new getInstitutionByID_args(this); + } + + @Override + public void clear() { + this.institutionID = null; + } + + public String getInstitutionID() { + return this.institutionID; + } + + public getInstitutionByID_args setInstitutionID(String institutionID) { + this.institutionID = institutionID; + return this; + } + + public void unsetInstitutionID() { + this.institutionID = null; + } + + /** Returns true if field institutionID is set (has been assigned a value) and false otherwise */ + public boolean isSetInstitutionID() { + return this.institutionID != null; + } + + public void setInstitutionIDIsSet(boolean value) { + if (!value) { + this.institutionID = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case INSTITUTION_ID: + if (value == null) { + unsetInstitutionID(); + } else { + setInstitutionID((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case INSTITUTION_ID: + return getInstitutionID(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case INSTITUTION_ID: + return isSetInstitutionID(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getInstitutionByID_args) + return this.equals((getInstitutionByID_args)that); + return false; + } + + public boolean equals(getInstitutionByID_args that) { + if (that == null) + return false; + + boolean this_present_institutionID = true && this.isSetInstitutionID(); + boolean that_present_institutionID = true && that.isSetInstitutionID(); + if (this_present_institutionID || that_present_institutionID) { + if (!(this_present_institutionID && that_present_institutionID)) + return false; + if (!this.institutionID.equals(that.institutionID)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(getInstitutionByID_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetInstitutionID()).compareTo(other.isSetInstitutionID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetInstitutionID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.institutionID, other.institutionID); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("getInstitutionByID_args("); + boolean first = true; + + sb.append("institutionID:"); + if (this.institutionID == null) { + sb.append("null"); + } else { + sb.append(this.institutionID); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class getInstitutionByID_argsStandardSchemeFactory implements SchemeFactory { + public getInstitutionByID_argsStandardScheme getScheme() { + return new getInstitutionByID_argsStandardScheme(); + } + } + + private static class getInstitutionByID_argsStandardScheme extends StandardScheme<getInstitutionByID_args> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, getInstitutionByID_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // INSTITUTION_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.institutionID = iprot.readString(); + struct.setInstitutionIDIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, getInstitutionByID_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.institutionID != null) { + oprot.writeFieldBegin(INSTITUTION_ID_FIELD_DESC); + oprot.writeString(struct.institutionID); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class getInstitutionByID_argsTupleSchemeFactory implements SchemeFactory { + public getInstitutionByID_argsTupleScheme getScheme() { + return new getInstitutionByID_argsTupleScheme(); + } + } + + private static class getInstitutionByID_argsTupleScheme extends TupleScheme<getInstitutionByID_args> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, getInstitutionByID_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetInstitutionID()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetInstitutionID()) { + oprot.writeString(struct.institutionID); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, getInstitutionByID_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.institutionID = iprot.readString(); + struct.setInstitutionIDIsSet(true); + } + } + } + + } + + public static class getInstitutionByID_result implements org.apache.thrift.TBase<getInstitutionByID_result, getInstitutionByID_result._Fields>, java.io.Serializable, Cloneable, Comparable<getInstitutionByID_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getInstitutionByID_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new getInstitutionByID_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new getInstitutionByID_resultTupleSchemeFactory()); + } + + public String success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getInstitutionByID_result.class, metaDataMap); + } + + public getInstitutionByID_result() { + } + + public getInstitutionByID_result( + String success) + { + this(); + this.success = success; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public getInstitutionByID_result(getInstitutionByID_result other) { + if (other.isSetSuccess()) { + this.success = other.success; + } + } + + public getInstitutionByID_result deepCopy() { + return new getInstitutionByID_result(this); + } + + @Override + public void clear() { + this.success = null; + } + + public String getSuccess() { + return this.success; + } + + public getInstitutionByID_result setSuccess(String success) { + this.success = success; + return this; + } + + public void unsetSuccess() { + this.success = null; + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return this.success != null; + } + + public void setSuccessIsSet(boolean value) { + if (!value) { + this.success = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return getSuccess(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getInstitutionByID_result) + return this.equals((getInstitutionByID_result)that); + return false; + } + + public boolean equals(getInstitutionByID_result that) { + if (that == null) + return false; + + boolean this_present_success = true && this.isSetSuccess(); + boolean that_present_success = true && that.isSetSuccess(); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(getInstitutionByID_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("getInstitutionByID_result("); + boolean first = true; + + sb.append("success:"); + if (this.success == null) { + sb.append("null"); + } else { + sb.append(this.success); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class getInstitutionByID_resultStandardSchemeFactory implements SchemeFactory { + public getInstitutionByID_resultStandardScheme getScheme() { + return new getInstitutionByID_resultStandardScheme(); + } + } + + private static class getInstitutionByID_resultStandardScheme extends StandardScheme<getInstitutionByID_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, getInstitutionByID_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.success = iprot.readString(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, getInstitutionByID_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeString(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class getInstitutionByID_resultTupleSchemeFactory implements SchemeFactory { + public getInstitutionByID_resultTupleScheme getScheme() { + return new getInstitutionByID_resultTupleScheme(); + } + } + + private static class getInstitutionByID_resultTupleScheme extends TupleScheme<getInstitutionByID_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, getInstitutionByID_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeString(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, getInstitutionByID_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readString(); + struct.setSuccessIsSet(true); + } + } + } + + } + } diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index d496489d..9144e4b1 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -236,7 +236,7 @@ public class SQL { - public String setPerson(String login, String lastname, String firstname,
+ public String setPerson(String userID, String lastname, String firstname,
String mail, Date lastlogin, String Institution) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try
@@ -258,6 +258,7 @@ public class SQL { con.commit();
if (ret.next() == false)
{
+ log.info("create user statement values are: userID, loginname, lastname, firstname, mail, institution VALUES: "+userID+" "+userID+" "+lastname+" "+firstname+" "+mail+" "+Institution);
sql = "INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES("
+ "?"
@@ -276,8 +277,8 @@ public class SQL { + ");";
prest = con.prepareStatement(sql);
- prest.setString(1, login);
- prest.setString(2, login);
+ prest.setString(1, userID);
+ prest.setString(2, userID);
prest.setString(3, lastname);
prest.setString(4, firstname);
prest.setString(5, mail);
@@ -325,10 +326,15 @@ public class SQL { public boolean setImageData(String pk_person, boolean license,
boolean internet, long cpu, long ram, String imagename,
String desc, String imagePath, long filesize, String shareMode,
- String pk_os, String uid) {
+ String pk_os, String uid)
+ {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ log.info("userID came as pk_person to SQL as: "+pk_person);
+ log.info("pk_os is: "+pk_os);
+ log.info("uid is: "+uid);
+
int internet_bol = 0;
int license_bol = 0;
if (internet == true) {
@@ -1633,8 +1639,9 @@ public class SQL { - public boolean checkUser(String username) {
- Statement stm;
+ public boolean checkUser(String username)
+ {
+
boolean ret = false;
try {
Connection con = getConnection();
@@ -2000,8 +2007,8 @@ public class SQL { prest.setString(4, userID);
prest.setBoolean(5, isRead);
prest.setBoolean(6, isWrite);
- prest.setBoolean(7, isAdmin);
- prest.setBoolean(8, isLinkAllowed);
+ prest.setBoolean(7, isLinkAllowed);
+ prest.setBoolean(8, isAdmin);
prest.executeUpdate();
@@ -2095,7 +2102,6 @@ public class SQL { public void deleteAllAdditionalImagePermissions(String imageID,
String userID) {
Connection con = getConnection();
- Statement stm = null;
try {
@@ -2219,13 +2225,14 @@ public class SQL { }
-
-
- public boolean userIsImageAdmin(String userID, String imageID) {
+ public boolean userIsImageAdmin(String userID, String imageID)
+ {
Connection con = getConnection();
ResultSet rs = null;
String sql = "SELECT image_admin FROM bwLehrpool.pm_VLData_image WHERE userID= ? AND GUID_imageID=?";
+ log.info("stmt user is image admin: " + "SELECT image_admin FROM bwLehrpool.pm_VLData_image WHERE userID= '"+userID+"' AND GUID_imageID='"+imageID+"'");
+
try
{
PreparedStatement prest = con.prepareStatement(sql);
@@ -2269,6 +2276,39 @@ public class SQL { }
return false;
}
+
+
+
+
+ public String getInstitutionByID(String institutionID,String errorParam) {
+
+ Connection con = getConnection();
+ ResultSet rs = null;
+ String sql = "SELECT name FROM bwLehrpool.m_institution WHERE institutionID = ?";
+
+ log.info("intitution ID is: "+institutionID);
+
+ PreparedStatement prest;
+ try {
+
+
+ prest = con.prepareStatement(sql);
+ prest.setString(1, institutionID);
+
+ rs = prest.executeQuery();
+ //con.commit();
+ rs.next();
+ return rs.getString("name");
+
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return null;
+
+
+ }
diff --git a/dozentenmodulserver/thrift/server.thrift b/dozentenmodulserver/thrift/server.thrift index defa0a2e..f3bb4f33 100644 --- a/dozentenmodulserver/thrift/server.thrift +++ b/dozentenmodulserver/thrift/server.thrift @@ -49,51 +49,53 @@ struct Person{ 11: bool lecture_admin } service Server{ - User getFtpUser(), - void setTokenForSession(1: string token), - int DeleteFtpUser(1: string user), - string getPathOfImage(1: string image_id, 2: string version), - string setInstitution(1: string university), - 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, 19: string uid), - list<Image> getImageListPermissionWrite(1: string userID), - list<Image> getImageListPermissionRead(1: string userID), - list<Image> getImageListPermissionLink(1: string userID), - list<Image> getImageListPermissionAdmin(1: string userID), - list<Image> getImageListAllTemplates(), - list<Image> getImageList(1: string userID), - list<Lecture> getLectureList(), - list<Lecture> getLectureListPermissionRead(1: string userID), - list<Lecture> getLectureListPermissionWrite(1: string userID), - list<Lecture> getLectureListPermissionAdmin(1: string userID), - list<string> getAllOS(), - list<string> getAllUniversities(), - map<string,string> getPersonData(1: string Vorname, 2: string Nachname), - map<string,string> getItemOwner(1: string itemID), - void setPerson(1: string login, 2:string lastname, 3: string firstname, 4: string mail, 5: string Institution), - 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, 16: string lectureID), - 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 writeAdditionalImageRights(1: string imageName, 2: string userID, 3: bool isRead, 4: bool isWrite, 5: bool isLinkAllowed, 6: bool isAdmin), - bool writeLectureRights(1: string lecturename, 2: string username, 3: string lastName, 4: string firstName, 5: string mail, 6: string university, 7: string role), - bool writeAdditionalLectureRights(1: string lectureName, 2: string userID, 3: bool isRead, 4: bool isWrite, 5: bool isAdmin), - list<Person>getAllOtherSatelliteUsers(1: list<string> userID), - list<Person>getPermissionForUserAndImage(1: string userID, 2: string imageID), - list<string>getAdditionalImageContacts(1: string imageID), - list<Person>getPermissionForUserAndLecture(1: string userID, 2: string lectureID), - void deleteAllAdditionalImagePermissions(1: string imageID, 2:string userID), - void deleteAllAdditionalLecturePermissions(1: string lectureID, 2: string userID), - string getOsNameForGuestOs(1: string guestOS), - bool userIsImageAdmin(1: string userID, 2: string imageID), - bool userIsLectureAdmin(1: string userID, 2: string lectureID), - string createRandomUUID() + User getFtpUser(1: string token), + bool authenticated(1: string token), + bool setSessionInvalid(1: string token), + int DeleteFtpUser(1: string user, 2: string token), + string getPathOfImage(1: string image_id, 2: string version, 3: string token), + string setInstitution(1: string university, 2:string token), + bool writeVLdata(1: string imagename, 2: string desc, 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, 19: string uid, 20:string token, 21: string userID), + list<Image> getImageListPermissionWrite(1: string userID, 2: string token), + list<Image> getImageListPermissionRead(1: string userID, 2: string token), + list<Image> getImageListPermissionLink(1: string userID, 2: string token), + list<Image> getImageListPermissionAdmin(1: string userID, 2: string token), + list<Image> getImageListAllTemplates(1: string token), + list<Image> getImageList(1: string token), + list<Lecture> getLectureList(1: string token), + list<Lecture> getLectureListPermissionRead(1: string token), + list<Lecture> getLectureListPermissionWrite(1: string token), + list<Lecture> getLectureListPermissionAdmin(1: string token), + list<string> getAllOS(1: string token), + list<string> getAllUniversities(1: string token), + map<string,string> getPersonData(1: string Vorname, 2: string Nachname, 3: string token), + map<string,string> getItemOwner(1: string itemID, 2: string token), + void setPerson(1: string userID, 2: string token, 3: string institution), + 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 token, 13: string Tel, 14: string Fak, 16: string lectureID, 17: string university), + bool startFileCopy(1: string file, 2:string token), + map<string,string> getImageData(1: string imageid, 2: string imageversion, 3: string token), + map<string,string> getLectureData(1: string lectureid, 2: string token), + 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, 15: string token), + bool deleteImageData(1: string id, 2: string version, 3: string token), + 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 token, 15: string Tel, 16: string Fak, 17: string id, 18: string university), + bool deleteImageServer(1: string id, 2: string version, 3: string token), + bool connectedToLecture(1: string id, 2: string version, 3: string token), + bool deleteLecture(1: string id, 2: string token, 3: string university), + bool checkUser(1: string username, 2: string token), + bool createUser(1: string token, 2: string university), + bool writeImageRights(1: string imagename, 2: string token, 3: string role, 4: string university, 5: string userID), + bool writeAdditionalImageRights(1: string imageName, 2: string userID, 3: bool isRead, 4: bool isWrite, 5: bool isLinkAllowed, 6: bool isAdmin, 7: string token), + bool writeLectureRights(1: string lectureID, 2: string role, 3: string token, 4: string university, 5: string userID), + bool writeAdditionalLectureRights(1: string lectureName, 2: string userID, 3: bool isRead, 4: bool isWrite, 5: bool isAdmin, 6: string token), + list<Person>getAllOtherSatelliteUsers(1: list<string> userID, 2: string token), + list<Person>getPermissionForUserAndImage(1: string token, 2: string imageID, 3: string userID), + list<string>getAdditionalImageContacts(1: string imageID, 2: string token), + list<Person>getPermissionForUserAndLecture(1: string token, 2: string lectureID, 3: string userID), + void deleteAllAdditionalImagePermissions(1: string imageID, 2:string token, 3: string userID), + void deleteAllAdditionalLecturePermissions(1: string lectureID, 2: string token, 3: string userID), + string getOsNameForGuestOs(1: string guestOS, 2: string token), + bool userIsImageAdmin(1: string imageID, 2: string token, 3: string userID), + bool userIsLectureAdmin(1: string userID, 2: string lectureID, 3: string token), + string createRandomUUID(1: string token), + string getInstitutionByID(1: string institutionID) } |