From 746af5d07d2b7745618eb75ef3757d150ab02042 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Fri, 17 Dec 2021 17:03:51 +0100 Subject: Update generated Thrift API to version 0.15.0 --- .../openslx/bwlp/thrift/iface/MasterServer.java | 8010 +++++++++++--------- 1 file changed, 4234 insertions(+), 3776 deletions(-) (limited to 'src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java') diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java index 4733419..8d97c8b 100644 --- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java +++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java @@ -1,143 +1,116 @@ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.15.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.openslx.bwlp.thrift.iface; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-09-06") +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17") public class MasterServer { public interface Iface { public boolean ping() throws org.apache.thrift.TException; - public SessionData authenticate(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public SessionData authenticate(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public ClientSessionData localAccountLogin(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public ClientSessionData localAccountLogin(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public void setUsedSatellite(String sessionId, String satelliteName) throws org.apache.thrift.TException; + public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName) throws org.apache.thrift.TException; - public List findUser(String sessionId, String organizationId, String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public java.util.List findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public List getPublicImages(String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public java.util.List getPublicImages(java.lang.String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public ImageDetailsRead getImageDetails(String sessionId, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException; + public ImageDetailsRead getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException; - public UserInfo getUser(String userToken, String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException; + public UserInfo getUser(java.lang.String userToken, java.lang.String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException; - public void invalidateSession(String sessionId) throws TInvalidTokenException, org.apache.thrift.TException; + public void invalidateSession(java.lang.String sessionId) throws TInvalidTokenException, org.apache.thrift.TException; - public UserInfo getUserFromToken(String token) throws TInvalidTokenException, org.apache.thrift.TException; + public UserInfo getUserFromToken(java.lang.String token) throws TInvalidTokenException, org.apache.thrift.TException; - public boolean isServerAuthenticated(String serverSessionId) throws org.apache.thrift.TException; + public boolean isServerAuthenticated(java.lang.String serverSessionId) throws org.apache.thrift.TException; - public ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public java.nio.ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public ServerSessionData serverAuthenticate(int satelliteId, ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public ServerSessionData serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public ImagePublishData getImageData(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException; + public ImagePublishData getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException; - public TransferInformation submitImage(String userToken, ImagePublishData imageDescription, List blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException; + public TransferInformation submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException; - public int registerSatellite(String userToken, String displayName, List addresses, String modulus, String exponent, ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException; + public int registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException; - public boolean updateSatellite(String serverSessionId, String displayName, List addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; + public boolean updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException; - public TransferInformation downloadImage(String sessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException; + public TransferInformation downloadImage(java.lang.String sessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException; - public List getOrganizations() throws TInvocationException, org.apache.thrift.TException; + public java.util.List getOrganizations() throws TInvocationException, org.apache.thrift.TException; - public List getOperatingSystems() throws TInvocationException, org.apache.thrift.TException; + public java.util.List getOperatingSystems() throws TInvocationException, org.apache.thrift.TException; - public List getVirtualizers() throws TInvocationException, org.apache.thrift.TException; + public java.util.List getVirtualizers() throws TInvocationException, org.apache.thrift.TException; - public List getTags(long startDate) throws TInvocationException, org.apache.thrift.TException; + public java.util.List getTags(long startDate) throws TInvocationException, org.apache.thrift.TException; - public List getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException; + public java.util.List getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException; - public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException; + public TransferStatus queryUploadStatus(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException; } public interface AsyncIface { - public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void authenticate(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void localAccountLogin(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void localAccountLogin(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void setUsedSatellite(String sessionId, String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPublicImages(java.lang.String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getImageDetails(String sessionId, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getUser(String userToken, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getUser(java.lang.String userToken, java.lang.String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void invalidateSession(String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void invalidateSession(java.lang.String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getUserFromToken(java.lang.String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void isServerAuthenticated(java.lang.String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void serverAuthenticate(int satelliteId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImageData(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void submitImage(String userToken, ImagePublishData imageDescription, List blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void registerSatellite(String userToken, String displayName, List addresses, String modulus, String exponent, ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateSatellite(String serverSessionId, String displayName, List addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void downloadImage(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void downloadImage(java.lang.String sessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void queryUploadStatus(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void queryUploadStatus(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -183,13 +156,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "ping failed: unknown result"); } - public SessionData authenticate(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public SessionData authenticate(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_authenticate(login, password); return recv_authenticate(); } - public void send_authenticate(String login, String password) throws org.apache.thrift.TException + public void send_authenticate(java.lang.String login, java.lang.String password) throws org.apache.thrift.TException { authenticate_args args = new authenticate_args(); args.setLogin(login); @@ -213,13 +186,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "authenticate failed: unknown result"); } - public ClientSessionData localAccountLogin(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public ClientSessionData localAccountLogin(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_localAccountLogin(login, password); return recv_localAccountLogin(); } - public void send_localAccountLogin(String login, String password) throws org.apache.thrift.TException + public void send_localAccountLogin(java.lang.String login, java.lang.String password) throws org.apache.thrift.TException { localAccountLogin_args args = new localAccountLogin_args(); args.setLogin(login); @@ -243,13 +216,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "localAccountLogin failed: unknown result"); } - public void setUsedSatellite(String sessionId, String satelliteName) throws org.apache.thrift.TException + public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName) throws org.apache.thrift.TException { send_setUsedSatellite(sessionId, satelliteName); recv_setUsedSatellite(); } - public void send_setUsedSatellite(String sessionId, String satelliteName) throws org.apache.thrift.TException + public void send_setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName) throws org.apache.thrift.TException { setUsedSatellite_args args = new setUsedSatellite_args(); args.setSessionId(sessionId); @@ -264,13 +237,13 @@ public class MasterServer { return; } - public List findUser(String sessionId, String organizationId, String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public java.util.List findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_findUser(sessionId, organizationId, searchTerm); return recv_findUser(); } - public void send_findUser(String sessionId, String organizationId, String searchTerm) throws org.apache.thrift.TException + public void send_findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm) throws org.apache.thrift.TException { findUser_args args = new findUser_args(); args.setSessionId(sessionId); @@ -279,7 +252,7 @@ public class MasterServer { sendBase("findUser", args); } - public List recv_findUser() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public java.util.List recv_findUser() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { findUser_result result = new findUser_result(); receiveBase(result, "findUser"); @@ -295,13 +268,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "findUser failed: unknown result"); } - public List getPublicImages(String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public java.util.List getPublicImages(java.lang.String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_getPublicImages(sessionId, page); return recv_getPublicImages(); } - public void send_getPublicImages(String sessionId, int page) throws org.apache.thrift.TException + public void send_getPublicImages(java.lang.String sessionId, int page) throws org.apache.thrift.TException { getPublicImages_args args = new getPublicImages_args(); args.setSessionId(sessionId); @@ -309,7 +282,7 @@ public class MasterServer { sendBase("getPublicImages", args); } - public List recv_getPublicImages() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public java.util.List recv_getPublicImages() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { getPublicImages_result result = new getPublicImages_result(); receiveBase(result, "getPublicImages"); @@ -325,13 +298,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPublicImages failed: unknown result"); } - public ImageDetailsRead getImageDetails(String sessionId, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException + public ImageDetailsRead getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException { send_getImageDetails(sessionId, imageBaseId); return recv_getImageDetails(); } - public void send_getImageDetails(String sessionId, String imageBaseId) throws org.apache.thrift.TException + public void send_getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId) throws org.apache.thrift.TException { getImageDetails_args args = new getImageDetails_args(); args.setSessionId(sessionId); @@ -358,13 +331,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageDetails failed: unknown result"); } - public UserInfo getUser(String userToken, String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException + public UserInfo getUser(java.lang.String userToken, java.lang.String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException { send_getUser(userToken, userId); return recv_getUser(); } - public void send_getUser(String userToken, String userId) throws org.apache.thrift.TException + public void send_getUser(java.lang.String userToken, java.lang.String userId) throws org.apache.thrift.TException { getUser_args args = new getUser_args(); args.setUserToken(userToken); @@ -391,13 +364,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUser failed: unknown result"); } - public void invalidateSession(String sessionId) throws TInvalidTokenException, org.apache.thrift.TException + public void invalidateSession(java.lang.String sessionId) throws TInvalidTokenException, org.apache.thrift.TException { send_invalidateSession(sessionId); recv_invalidateSession(); } - public void send_invalidateSession(String sessionId) throws org.apache.thrift.TException + public void send_invalidateSession(java.lang.String sessionId) throws org.apache.thrift.TException { invalidateSession_args args = new invalidateSession_args(); args.setSessionId(sessionId); @@ -414,13 +387,13 @@ public class MasterServer { return; } - public UserInfo getUserFromToken(String token) throws TInvalidTokenException, org.apache.thrift.TException + public UserInfo getUserFromToken(java.lang.String token) throws TInvalidTokenException, org.apache.thrift.TException { send_getUserFromToken(token); return recv_getUserFromToken(); } - public void send_getUserFromToken(String token) throws org.apache.thrift.TException + public void send_getUserFromToken(java.lang.String token) throws org.apache.thrift.TException { getUserFromToken_args args = new getUserFromToken_args(); args.setToken(token); @@ -440,13 +413,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserFromToken failed: unknown result"); } - public boolean isServerAuthenticated(String serverSessionId) throws org.apache.thrift.TException + public boolean isServerAuthenticated(java.lang.String serverSessionId) throws org.apache.thrift.TException { send_isServerAuthenticated(serverSessionId); return recv_isServerAuthenticated(); } - public void send_isServerAuthenticated(String serverSessionId) throws org.apache.thrift.TException + public void send_isServerAuthenticated(java.lang.String serverSessionId) throws org.apache.thrift.TException { isServerAuthenticated_args args = new isServerAuthenticated_args(); args.setServerSessionId(serverSessionId); @@ -463,7 +436,7 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isServerAuthenticated failed: unknown result"); } - public ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public java.nio.ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_startServerAuthentication(satelliteId); return recv_startServerAuthentication(); @@ -476,7 +449,7 @@ public class MasterServer { sendBase("startServerAuthentication", args); } - public ByteBuffer recv_startServerAuthentication() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public java.nio.ByteBuffer recv_startServerAuthentication() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { startServerAuthentication_result result = new startServerAuthentication_result(); receiveBase(result, "startServerAuthentication"); @@ -492,13 +465,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startServerAuthentication failed: unknown result"); } - public ServerSessionData serverAuthenticate(int satelliteId, ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public ServerSessionData serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_serverAuthenticate(satelliteId, challengeResponse); return recv_serverAuthenticate(); } - public void send_serverAuthenticate(int satelliteId, ByteBuffer challengeResponse) throws org.apache.thrift.TException + public void send_serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse) throws org.apache.thrift.TException { serverAuthenticate_args args = new serverAuthenticate_args(); args.setSatelliteId(satelliteId); @@ -522,13 +495,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "serverAuthenticate failed: unknown result"); } - public ImagePublishData getImageData(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException + public ImagePublishData getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException { send_getImageData(serverSessionId, imageVersionId); return recv_getImageData(); } - public void send_getImageData(String serverSessionId, String imageVersionId) throws org.apache.thrift.TException + public void send_getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId) throws org.apache.thrift.TException { getImageData_args args = new getImageData_args(); args.setServerSessionId(serverSessionId); @@ -555,13 +528,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public TransferInformation submitImage(String userToken, ImagePublishData imageDescription, List blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException + public TransferInformation submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException { send_submitImage(userToken, imageDescription, blockHashes); return recv_submitImage(); } - public void send_submitImage(String userToken, ImagePublishData imageDescription, List blockHashes) throws org.apache.thrift.TException + public void send_submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List blockHashes) throws org.apache.thrift.TException { submitImage_args args = new submitImage_args(); args.setUserToken(userToken); @@ -589,13 +562,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submitImage failed: unknown result"); } - public int registerSatellite(String userToken, String displayName, List addresses, String modulus, String exponent, ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException + public int registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException { send_registerSatellite(userToken, displayName, addresses, modulus, exponent, certsha256); return recv_registerSatellite(); } - public void send_registerSatellite(String userToken, String displayName, List addresses, String modulus, String exponent, ByteBuffer certsha256) throws org.apache.thrift.TException + public void send_registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256) throws org.apache.thrift.TException { registerSatellite_args args = new registerSatellite_args(); args.setUserToken(userToken); @@ -620,13 +593,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerSatellite failed: unknown result"); } - public boolean updateSatellite(String serverSessionId, String displayName, List addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException + public boolean updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { send_updateSatellite(serverSessionId, displayName, addresses); return recv_updateSatellite(); } - public void send_updateSatellite(String serverSessionId, String displayName, List addresses) throws org.apache.thrift.TException + public void send_updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List addresses) throws org.apache.thrift.TException { updateSatellite_args args = new updateSatellite_args(); args.setServerSessionId(serverSessionId); @@ -651,13 +624,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateSatellite failed: unknown result"); } - public TransferInformation downloadImage(String sessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException + public TransferInformation downloadImage(java.lang.String sessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException { send_downloadImage(sessionId, imageVersionId); return recv_downloadImage(); } - public void send_downloadImage(String sessionId, String imageVersionId) throws org.apache.thrift.TException + public void send_downloadImage(java.lang.String sessionId, java.lang.String imageVersionId) throws org.apache.thrift.TException { downloadImage_args args = new downloadImage_args(); args.setSessionId(sessionId); @@ -684,7 +657,7 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "downloadImage failed: unknown result"); } - public List getOrganizations() throws TInvocationException, org.apache.thrift.TException + public java.util.List getOrganizations() throws TInvocationException, org.apache.thrift.TException { send_getOrganizations(); return recv_getOrganizations(); @@ -696,7 +669,7 @@ public class MasterServer { sendBase("getOrganizations", args); } - public List recv_getOrganizations() throws TInvocationException, org.apache.thrift.TException + public java.util.List recv_getOrganizations() throws TInvocationException, org.apache.thrift.TException { getOrganizations_result result = new getOrganizations_result(); receiveBase(result, "getOrganizations"); @@ -709,7 +682,7 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOrganizations failed: unknown result"); } - public List getOperatingSystems() throws TInvocationException, org.apache.thrift.TException + public java.util.List getOperatingSystems() throws TInvocationException, org.apache.thrift.TException { send_getOperatingSystems(); return recv_getOperatingSystems(); @@ -721,7 +694,7 @@ public class MasterServer { sendBase("getOperatingSystems", args); } - public List recv_getOperatingSystems() throws TInvocationException, org.apache.thrift.TException + public java.util.List recv_getOperatingSystems() throws TInvocationException, org.apache.thrift.TException { getOperatingSystems_result result = new getOperatingSystems_result(); receiveBase(result, "getOperatingSystems"); @@ -734,7 +707,7 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOperatingSystems failed: unknown result"); } - public List getVirtualizers() throws TInvocationException, org.apache.thrift.TException + public java.util.List getVirtualizers() throws TInvocationException, org.apache.thrift.TException { send_getVirtualizers(); return recv_getVirtualizers(); @@ -746,7 +719,7 @@ public class MasterServer { sendBase("getVirtualizers", args); } - public List recv_getVirtualizers() throws TInvocationException, org.apache.thrift.TException + public java.util.List recv_getVirtualizers() throws TInvocationException, org.apache.thrift.TException { getVirtualizers_result result = new getVirtualizers_result(); receiveBase(result, "getVirtualizers"); @@ -759,7 +732,7 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVirtualizers failed: unknown result"); } - public List getTags(long startDate) throws TInvocationException, org.apache.thrift.TException + public java.util.List getTags(long startDate) throws TInvocationException, org.apache.thrift.TException { send_getTags(startDate); return recv_getTags(); @@ -772,7 +745,7 @@ public class MasterServer { sendBase("getTags", args); } - public List recv_getTags() throws TInvocationException, org.apache.thrift.TException + public java.util.List recv_getTags() throws TInvocationException, org.apache.thrift.TException { getTags_result result = new getTags_result(); receiveBase(result, "getTags"); @@ -785,7 +758,7 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTags failed: unknown result"); } - public List getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException + public java.util.List getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException { send_getSoftware(startDate); return recv_getSoftware(); @@ -798,7 +771,7 @@ public class MasterServer { sendBase("getSoftware", args); } - public List recv_getSoftware() throws TInvocationException, org.apache.thrift.TException + public java.util.List recv_getSoftware() throws TInvocationException, org.apache.thrift.TException { getSoftware_result result = new getSoftware_result(); receiveBase(result, "getSoftware"); @@ -811,13 +784,13 @@ public class MasterServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSoftware failed: unknown result"); } - public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException + public TransferStatus queryUploadStatus(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException { send_queryUploadStatus(uploadToken); return recv_queryUploadStatus(); } - public void send_queryUploadStatus(String uploadToken) throws org.apache.thrift.TException + public void send_queryUploadStatus(java.lang.String uploadToken) throws org.apache.thrift.TException { queryUploadStatus_args args = new queryUploadStatus_args(); args.setUploadToken(uploadToken); @@ -855,15 +828,15 @@ public class MasterServer { super(protocolFactory, clientManager, transport); } - public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall { - public ping_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 { + public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall { + public ping_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 { super(client, protocolFactory, transport, resultHandler, false); } @@ -874,9 +847,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public boolean getResult() throws org.apache.thrift.TException { + public java.lang.Boolean getResult() throws org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -884,17 +857,17 @@ public class MasterServer { } } - public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void authenticate(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); authenticate_call method_call = new authenticate_call(login, password, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall { - private String login; - private String password; - public authenticate_call(String login, String password, 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 static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String login; + private java.lang.String password; + public authenticate_call(java.lang.String login, java.lang.String password, 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.password = password; @@ -911,7 +884,7 @@ public class MasterServer { public SessionData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -919,17 +892,17 @@ public class MasterServer { } } - public void localAccountLogin(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void localAccountLogin(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); localAccountLogin_call method_call = new localAccountLogin_call(login, password, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class localAccountLogin_call extends org.apache.thrift.async.TAsyncMethodCall { - private String login; - private String password; - public localAccountLogin_call(String login, String password, 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 static class localAccountLogin_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String login; + private java.lang.String password; + public localAccountLogin_call(java.lang.String login, java.lang.String password, 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.password = password; @@ -946,7 +919,7 @@ public class MasterServer { public ClientSessionData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -954,17 +927,17 @@ public class MasterServer { } } - public void setUsedSatellite(String sessionId, String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); setUsedSatellite_call method_call = new setUsedSatellite_call(sessionId, satelliteName, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class setUsedSatellite_call extends org.apache.thrift.async.TAsyncMethodCall { - private String sessionId; - private String satelliteName; - public setUsedSatellite_call(String sessionId, String satelliteName, 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 static class setUsedSatellite_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String sessionId; + private java.lang.String satelliteName; + public setUsedSatellite_call(java.lang.String sessionId, java.lang.String satelliteName, 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.sessionId = sessionId; this.satelliteName = satelliteName; @@ -979,28 +952,28 @@ public class MasterServer { prot.writeMessageEnd(); } - public void getResult() throws org.apache.thrift.TException { + public Void getResult() throws org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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_setUsedSatellite(); + return null; } } - public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); findUser_call method_call = new findUser_call(sessionId, organizationId, searchTerm, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class findUser_call extends org.apache.thrift.async.TAsyncMethodCall { - private String sessionId; - private String organizationId; - private String searchTerm; - public findUser_call(String sessionId, String organizationId, String searchTerm, 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 static class findUser_call extends org.apache.thrift.async.TAsyncMethodCall> { + private java.lang.String sessionId; + private java.lang.String organizationId; + private java.lang.String searchTerm; + public findUser_call(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm, 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.sessionId = sessionId; this.organizationId = organizationId; @@ -1017,9 +990,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1027,17 +1000,17 @@ public class MasterServer { } } - public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPublicImages(java.lang.String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getPublicImages_call method_call = new getPublicImages_call(sessionId, page, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getPublicImages_call extends org.apache.thrift.async.TAsyncMethodCall { - private String sessionId; + public static class getPublicImages_call extends org.apache.thrift.async.TAsyncMethodCall> { + private java.lang.String sessionId; private int page; - public getPublicImages_call(String sessionId, int page, 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 getPublicImages_call(java.lang.String sessionId, int page, 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.sessionId = sessionId; this.page = page; @@ -1052,9 +1025,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1062,17 +1035,17 @@ public class MasterServer { } } - public void getImageDetails(String sessionId, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getImageDetails_call method_call = new getImageDetails_call(sessionId, imageBaseId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getImageDetails_call extends org.apache.thrift.async.TAsyncMethodCall { - private String sessionId; - private String imageBaseId; - public getImageDetails_call(String sessionId, String imageBaseId, 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 static class getImageDetails_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String sessionId; + private java.lang.String imageBaseId; + public getImageDetails_call(java.lang.String sessionId, java.lang.String imageBaseId, 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.sessionId = sessionId; this.imageBaseId = imageBaseId; @@ -1089,7 +1062,7 @@ public class MasterServer { public ImageDetailsRead getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1097,17 +1070,17 @@ public class MasterServer { } } - public void getUser(String userToken, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getUser(java.lang.String userToken, java.lang.String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getUser_call method_call = new getUser_call(userToken, userId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getUser_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userToken; - private String userId; - public getUser_call(String userToken, 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 static class getUser_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String userToken; + private java.lang.String userId; + public getUser_call(java.lang.String userToken, java.lang.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.userToken = userToken; this.userId = userId; @@ -1124,7 +1097,7 @@ public class MasterServer { public UserInfo getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1132,16 +1105,16 @@ public class MasterServer { } } - public void invalidateSession(String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void invalidateSession(java.lang.String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); invalidateSession_call method_call = new invalidateSession_call(sessionId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class invalidateSession_call extends org.apache.thrift.async.TAsyncMethodCall { - private String sessionId; - public invalidateSession_call(String sessionId, 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 static class invalidateSession_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String sessionId; + public invalidateSession_call(java.lang.String sessionId, 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.sessionId = sessionId; } @@ -1154,26 +1127,26 @@ public class MasterServer { prot.writeMessageEnd(); } - public void getResult() throws TInvalidTokenException, org.apache.thrift.TException { + public Void getResult() throws TInvalidTokenException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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_invalidateSession(); + return null; } } - public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getUserFromToken(java.lang.String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getUserFromToken_call method_call = new getUserFromToken_call(token, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall { - private String token; - public getUserFromToken_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 static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String token; + public getUserFromToken_call(java.lang.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; } @@ -1188,7 +1161,7 @@ public class MasterServer { public UserInfo getResult() throws TInvalidTokenException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1196,16 +1169,16 @@ public class MasterServer { } } - public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void isServerAuthenticated(java.lang.String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); isServerAuthenticated_call method_call = new isServerAuthenticated_call(serverSessionId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall { - private String serverSessionId; - public isServerAuthenticated_call(String serverSessionId, 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 static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String serverSessionId; + public isServerAuthenticated_call(java.lang.String serverSessionId, 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.serverSessionId = serverSessionId; } @@ -1218,9 +1191,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public boolean getResult() throws org.apache.thrift.TException { + public java.lang.Boolean getResult() throws org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1228,16 +1201,16 @@ public class MasterServer { } } - public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); startServerAuthentication_call method_call = new startServerAuthentication_call(satelliteId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall { private int satelliteId; - public startServerAuthentication_call(int satelliteId, 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 startServerAuthentication_call(int satelliteId, 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.satelliteId = satelliteId; } @@ -1250,9 +1223,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public ByteBuffer getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { + public java.nio.ByteBuffer getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1260,17 +1233,17 @@ public class MasterServer { } } - public void serverAuthenticate(int satelliteId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); serverAuthenticate_call method_call = new serverAuthenticate_call(satelliteId, challengeResponse, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall { private int satelliteId; - private ByteBuffer challengeResponse; - public serverAuthenticate_call(int satelliteId, ByteBuffer challengeResponse, 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 java.nio.ByteBuffer challengeResponse; + public serverAuthenticate_call(int satelliteId, java.nio.ByteBuffer challengeResponse, 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.satelliteId = satelliteId; this.challengeResponse = challengeResponse; @@ -1287,7 +1260,7 @@ public class MasterServer { public ServerSessionData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1295,17 +1268,17 @@ public class MasterServer { } } - public void getImageData(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getImageData_call method_call = new getImageData_call(serverSessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getImageData_call extends org.apache.thrift.async.TAsyncMethodCall { - private String serverSessionId; - private String imageVersionId; - public getImageData_call(String serverSessionId, String imageVersionId, 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 static class getImageData_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String serverSessionId; + private java.lang.String imageVersionId; + public getImageData_call(java.lang.String serverSessionId, java.lang.String imageVersionId, 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.serverSessionId = serverSessionId; this.imageVersionId = imageVersionId; @@ -1322,7 +1295,7 @@ public class MasterServer { public ImagePublishData getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1330,18 +1303,18 @@ public class MasterServer { } } - public void submitImage(String userToken, ImagePublishData imageDescription, List blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); submitImage_call method_call = new submitImage_call(userToken, imageDescription, blockHashes, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class submitImage_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userToken; + public static class submitImage_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String userToken; private ImagePublishData imageDescription; - private List blockHashes; - public submitImage_call(String userToken, ImagePublishData imageDescription, List blockHashes, 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 java.util.List blockHashes; + public submitImage_call(java.lang.String userToken, ImagePublishData imageDescription, java.util.List blockHashes, 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.userToken = userToken; this.imageDescription = imageDescription; @@ -1360,7 +1333,7 @@ public class MasterServer { public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1368,21 +1341,21 @@ public class MasterServer { } } - public void registerSatellite(String userToken, String displayName, List addresses, String modulus, String exponent, ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); registerSatellite_call method_call = new registerSatellite_call(userToken, displayName, addresses, modulus, exponent, certsha256, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class registerSatellite_call extends org.apache.thrift.async.TAsyncMethodCall { - private String userToken; - private String displayName; - private List addresses; - private String modulus; - private String exponent; - private ByteBuffer certsha256; - public registerSatellite_call(String userToken, String displayName, List addresses, String modulus, String exponent, ByteBuffer certsha256, 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 static class registerSatellite_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String userToken; + private java.lang.String displayName; + private java.util.List addresses; + private java.lang.String modulus; + private java.lang.String exponent; + private java.nio.ByteBuffer certsha256; + public registerSatellite_call(java.lang.String userToken, java.lang.String displayName, java.util.List addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256, 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.userToken = userToken; this.displayName = displayName; @@ -1405,9 +1378,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public int getResult() throws TInvocationException, org.apache.thrift.TException { + public java.lang.Integer getResult() throws TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1415,18 +1388,18 @@ public class MasterServer { } } - public void updateSatellite(String serverSessionId, String displayName, List addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); updateSatellite_call method_call = new updateSatellite_call(serverSessionId, displayName, addresses, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class updateSatellite_call extends org.apache.thrift.async.TAsyncMethodCall { - private String serverSessionId; - private String displayName; - private List addresses; - public updateSatellite_call(String serverSessionId, String displayName, List addresses, 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 static class updateSatellite_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String serverSessionId; + private java.lang.String displayName; + private java.util.List addresses; + public updateSatellite_call(java.lang.String serverSessionId, java.lang.String displayName, java.util.List addresses, 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.serverSessionId = serverSessionId; this.displayName = displayName; @@ -1443,9 +1416,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public boolean getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { + public java.lang.Boolean getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1453,17 +1426,17 @@ public class MasterServer { } } - public void downloadImage(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void downloadImage(java.lang.String sessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); downloadImage_call method_call = new downloadImage_call(sessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class downloadImage_call extends org.apache.thrift.async.TAsyncMethodCall { - private String sessionId; - private String imageVersionId; - public downloadImage_call(String sessionId, String imageVersionId, 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 static class downloadImage_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String sessionId; + private java.lang.String imageVersionId; + public downloadImage_call(java.lang.String sessionId, java.lang.String imageVersionId, 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.sessionId = sessionId; this.imageVersionId = imageVersionId; @@ -1480,7 +1453,7 @@ public class MasterServer { public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1488,15 +1461,15 @@ public class MasterServer { } } - public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getOrganizations_call method_call = new getOrganizations_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall { - public getOrganizations_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 { + public static class getOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall> { + public getOrganizations_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 { super(client, protocolFactory, transport, resultHandler, false); } @@ -1507,9 +1480,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1517,15 +1490,15 @@ public class MasterServer { } } - public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getOperatingSystems_call method_call = new getOperatingSystems_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getOperatingSystems_call extends org.apache.thrift.async.TAsyncMethodCall { - public getOperatingSystems_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 { + public static class getOperatingSystems_call extends org.apache.thrift.async.TAsyncMethodCall> { + public getOperatingSystems_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 { super(client, protocolFactory, transport, resultHandler, false); } @@ -1536,9 +1509,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1546,15 +1519,15 @@ public class MasterServer { } } - public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getVirtualizers_call method_call = new getVirtualizers_call(resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getVirtualizers_call extends org.apache.thrift.async.TAsyncMethodCall { - public getVirtualizers_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 { + public static class getVirtualizers_call extends org.apache.thrift.async.TAsyncMethodCall> { + public getVirtualizers_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 { super(client, protocolFactory, transport, resultHandler, false); } @@ -1565,9 +1538,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1575,16 +1548,16 @@ public class MasterServer { } } - public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getTags_call method_call = new getTags_call(startDate, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getTags_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getTags_call extends org.apache.thrift.async.TAsyncMethodCall> { private long startDate; - public getTags_call(long startDate, 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 getTags_call(long startDate, 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.startDate = startDate; } @@ -1597,9 +1570,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1607,16 +1580,16 @@ public class MasterServer { } } - public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); getSoftware_call method_call = new getSoftware_call(startDate, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class getSoftware_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getSoftware_call extends org.apache.thrift.async.TAsyncMethodCall> { private long startDate; - public getSoftware_call(long startDate, 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 getSoftware_call(long startDate, 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.startDate = startDate; } @@ -1629,9 +1602,9 @@ public class MasterServer { prot.writeMessageEnd(); } - public List getResult() throws TInvocationException, org.apache.thrift.TException { + public java.util.List getResult() throws TInvocationException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1639,16 +1612,16 @@ public class MasterServer { } } - public void queryUploadStatus(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void queryUploadStatus(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); queryUploadStatus_call method_call = new queryUploadStatus_call(uploadToken, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } - public static class queryUploadStatus_call extends org.apache.thrift.async.TAsyncMethodCall { - private String uploadToken; - public queryUploadStatus_call(String uploadToken, 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 static class queryUploadStatus_call extends org.apache.thrift.async.TAsyncMethodCall { + private java.lang.String uploadToken; + public queryUploadStatus_call(java.lang.String uploadToken, 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.uploadToken = uploadToken; } @@ -1663,7 +1636,7 @@ public class MasterServer { public TransferStatus getResult() throws TInvalidTokenException, org.apache.thrift.TException { if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new IllegalStateException("Method call not finished!"); + throw new java.lang.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); @@ -1674,16 +1647,16 @@ public class MasterServer { } public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { - private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); + private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName()); public Processor(I iface) { - super(iface, getProcessMap(new HashMap>())); + super(iface, getProcessMap(new java.util.HashMap>())); } - protected Processor(I iface, Map> processMap) { + protected Processor(I iface, java.util.Map> processMap) { super(iface, getProcessMap(processMap)); } - private static Map> getProcessMap(Map> processMap) { + private static java.util.Map> getProcessMap(java.util.Map> processMap) { processMap.put("ping", new ping()); processMap.put("authenticate", new authenticate()); processMap.put("localAccountLogin", new localAccountLogin()); @@ -1724,6 +1697,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.TException { ping_result result = new ping_result(); result.success = iface.ping(); @@ -1745,6 +1723,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public authenticate_result getResult(I iface, authenticate_args args) throws org.apache.thrift.TException { authenticate_result result = new authenticate_result(); try { @@ -1771,6 +1754,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public localAccountLogin_result getResult(I iface, localAccountLogin_args args) throws org.apache.thrift.TException { localAccountLogin_result result = new localAccountLogin_result(); try { @@ -1797,6 +1785,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public setUsedSatellite_result getResult(I iface, setUsedSatellite_args args) throws org.apache.thrift.TException { setUsedSatellite_result result = new setUsedSatellite_result(); iface.setUsedSatellite(args.sessionId, args.satelliteName); @@ -1817,6 +1810,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public findUser_result getResult(I iface, findUser_args args) throws org.apache.thrift.TException { findUser_result result = new findUser_result(); try { @@ -1843,6 +1841,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getPublicImages_result getResult(I iface, getPublicImages_args args) throws org.apache.thrift.TException { getPublicImages_result result = new getPublicImages_result(); try { @@ -1869,6 +1872,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getImageDetails_result getResult(I iface, getImageDetails_args args) throws org.apache.thrift.TException { getImageDetails_result result = new getImageDetails_result(); try { @@ -1897,6 +1905,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getUser_result getResult(I iface, getUser_args args) throws org.apache.thrift.TException { getUser_result result = new getUser_result(); try { @@ -1925,6 +1938,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public invalidateSession_result getResult(I iface, invalidateSession_args args) throws org.apache.thrift.TException { invalidateSession_result result = new invalidateSession_result(); try { @@ -1949,6 +1967,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getUserFromToken_result getResult(I iface, getUserFromToken_args args) throws org.apache.thrift.TException { getUserFromToken_result result = new getUserFromToken_result(); try { @@ -1973,6 +1996,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public isServerAuthenticated_result getResult(I iface, isServerAuthenticated_args args) throws org.apache.thrift.TException { isServerAuthenticated_result result = new isServerAuthenticated_result(); result.success = iface.isServerAuthenticated(args.serverSessionId); @@ -1994,6 +2022,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public startServerAuthentication_result getResult(I iface, startServerAuthentication_args args) throws org.apache.thrift.TException { startServerAuthentication_result result = new startServerAuthentication_result(); try { @@ -2020,6 +2053,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public serverAuthenticate_result getResult(I iface, serverAuthenticate_args args) throws org.apache.thrift.TException { serverAuthenticate_result result = new serverAuthenticate_result(); try { @@ -2046,6 +2084,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getImageData_result getResult(I iface, getImageData_args args) throws org.apache.thrift.TException { getImageData_result result = new getImageData_result(); try { @@ -2074,6 +2117,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public submitImage_result getResult(I iface, submitImage_args args) throws org.apache.thrift.TException { submitImage_result result = new submitImage_result(); try { @@ -2102,6 +2150,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public registerSatellite_result getResult(I iface, registerSatellite_args args) throws org.apache.thrift.TException { registerSatellite_result result = new registerSatellite_result(); try { @@ -2127,6 +2180,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public updateSatellite_result getResult(I iface, updateSatellite_args args) throws org.apache.thrift.TException { updateSatellite_result result = new updateSatellite_result(); try { @@ -2154,6 +2212,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public downloadImage_result getResult(I iface, downloadImage_args args) throws org.apache.thrift.TException { downloadImage_result result = new downloadImage_result(); try { @@ -2182,6 +2245,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getOrganizations_result getResult(I iface, getOrganizations_args args) throws org.apache.thrift.TException { getOrganizations_result result = new getOrganizations_result(); try { @@ -2206,6 +2274,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getOperatingSystems_result getResult(I iface, getOperatingSystems_args args) throws org.apache.thrift.TException { getOperatingSystems_result result = new getOperatingSystems_result(); try { @@ -2230,6 +2303,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getVirtualizers_result getResult(I iface, getVirtualizers_args args) throws org.apache.thrift.TException { getVirtualizers_result result = new getVirtualizers_result(); try { @@ -2254,6 +2332,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getTags_result getResult(I iface, getTags_args args) throws org.apache.thrift.TException { getTags_result result = new getTags_result(); try { @@ -2278,6 +2361,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public getSoftware_result getResult(I iface, getSoftware_args args) throws org.apache.thrift.TException { getSoftware_result result = new getSoftware_result(); try { @@ -2302,6 +2390,11 @@ public class MasterServer { return false; } + @Override + protected boolean rethrowUnhandledExceptions() { + return false; + } + public queryUploadStatus_result getResult(I iface, queryUploadStatus_args args) throws org.apache.thrift.TException { queryUploadStatus_result result = new queryUploadStatus_result(); try { @@ -2316,16 +2409,16 @@ public class MasterServer { } public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { - private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); + private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName()); public AsyncProcessor(I iface) { - super(iface, getProcessMap(new HashMap>())); + super(iface, getProcessMap(new java.util.HashMap>())); } - protected AsyncProcessor(I iface, Map> processMap) { + protected AsyncProcessor(I iface, java.util.Map> processMap) { super(iface, getProcessMap(processMap)); } - private static Map> getProcessMap(Map> processMap) { + private static java.util.Map> getProcessMap(java.util.Map> processMap) { processMap.put("ping", new ping()); processMap.put("authenticate", new authenticate()); processMap.put("localAccountLogin", new localAccountLogin()); @@ -2353,7 +2446,7 @@ public class MasterServer { return processMap; } - public static class ping extends org.apache.thrift.AsyncProcessFunction { + public static class ping extends org.apache.thrift.AsyncProcessFunction { public ping() { super("ping"); } @@ -2362,36 +2455,46 @@ public class MasterServer { return new ping_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { - public void onComplete(Boolean o) { + return new org.apache.thrift.async.AsyncMethodCallback() { + public void onComplete(java.lang.Boolean o) { ping_result result = new ping_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; ping_result result = new ping_result(); - { + if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2400,7 +2503,7 @@ public class MasterServer { return false; } - public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.ping(resultHandler); } } @@ -2414,46 +2517,53 @@ public class MasterServer { return new authenticate_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(SessionData o) { authenticate_result result = new authenticate_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; authenticate_result result = new authenticate_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2462,7 +2572,7 @@ public class MasterServer { return false; } - public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.authenticate(args.login, args.password,resultHandler); } } @@ -2476,46 +2586,53 @@ public class MasterServer { return new localAccountLogin_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(ClientSessionData o) { localAccountLogin_result result = new localAccountLogin_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; localAccountLogin_result result = new localAccountLogin_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2524,7 +2641,7 @@ public class MasterServer { return false; } - public void start(I iface, localAccountLogin_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, localAccountLogin_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.localAccountLogin(args.login, args.password,resultHandler); } } @@ -2538,34 +2655,44 @@ public class MasterServer { return new setUsedSatellite_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(Void o) { setUsedSatellite_result result = new setUsedSatellite_result(); 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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; setUsedSatellite_result result = new setUsedSatellite_result(); - { + if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2574,12 +2701,12 @@ public class MasterServer { return false; } - public void start(I iface, setUsedSatellite_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, setUsedSatellite_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.setUsedSatellite(args.sessionId, args.satelliteName,resultHandler); } } - public static class findUser extends org.apache.thrift.AsyncProcessFunction> { + public static class findUser extends org.apache.thrift.AsyncProcessFunction> { public findUser() { super("findUser"); } @@ -2588,46 +2715,53 @@ public class MasterServer { return new findUser_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { findUser_result result = new findUser_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; findUser_result result = new findUser_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2636,12 +2770,12 @@ public class MasterServer { return false; } - public void start(I iface, findUser_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, findUser_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.findUser(args.sessionId, args.organizationId, args.searchTerm,resultHandler); } } - public static class getPublicImages extends org.apache.thrift.AsyncProcessFunction> { + public static class getPublicImages extends org.apache.thrift.AsyncProcessFunction> { public getPublicImages() { super("getPublicImages"); } @@ -2650,46 +2784,53 @@ public class MasterServer { return new getPublicImages_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { getPublicImages_result result = new getPublicImages_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getPublicImages_result result = new getPublicImages_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2698,7 +2839,7 @@ public class MasterServer { return false; } - public void start(I iface, getPublicImages_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, getPublicImages_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.getPublicImages(args.sessionId, args.page,resultHandler); } } @@ -2712,51 +2853,57 @@ public class MasterServer { return new getImageDetails_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(ImageDetailsRead o) { getImageDetails_result result = new getImageDetails_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getImageDetails_result result = new getImageDetails_result(); if (e instanceof TAuthorizationException) { - result.authError = (TAuthorizationException) e; - result.setAuthErrorIsSet(true); - msg = result; - } - else if (e instanceof TNotFoundException) { - result.notFound = (TNotFoundException) e; - result.setNotFoundIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.authError = (TAuthorizationException) e; + result.setAuthErrorIsSet(true); + msg = result; + } else if (e instanceof TNotFoundException) { + result.notFound = (TNotFoundException) e; + result.setNotFoundIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2765,7 +2912,7 @@ public class MasterServer { return false; } - public void start(I iface, getImageDetails_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, getImageDetails_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.getImageDetails(args.sessionId, args.imageBaseId,resultHandler); } } @@ -2779,51 +2926,57 @@ public class MasterServer { return new getUser_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(UserInfo o) { getUser_result result = new getUser_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getUser_result result = new getUser_result(); if (e instanceof TAuthorizationException) { - result.authError = (TAuthorizationException) e; - result.setAuthErrorIsSet(true); - msg = result; - } - else if (e instanceof TNotFoundException) { - result.notFound = (TNotFoundException) e; - result.setNotFoundIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.authError = (TAuthorizationException) e; + result.setAuthErrorIsSet(true); + msg = result; + } else if (e instanceof TNotFoundException) { + result.notFound = (TNotFoundException) e; + result.setNotFoundIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2832,7 +2985,7 @@ public class MasterServer { return false; } - public void start(I iface, getUser_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, getUser_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.getUser(args.userToken, args.userId,resultHandler); } } @@ -2846,40 +2999,48 @@ public class MasterServer { return new invalidateSession_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(Void o) { invalidateSession_result result = new invalidateSession_result(); 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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; invalidateSession_result result = new invalidateSession_result(); if (e instanceof TInvalidTokenException) { - result.ex = (TInvalidTokenException) e; - result.setExIsSet(true); - msg = result; - } - else - { + result.ex = (TInvalidTokenException) e; + result.setExIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2888,7 +3049,7 @@ public class MasterServer { return false; } - public void start(I iface, invalidateSession_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, invalidateSession_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.invalidateSession(args.sessionId,resultHandler); } } @@ -2902,41 +3063,49 @@ public class MasterServer { return new getUserFromToken_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(UserInfo o) { getUserFromToken_result result = new getUserFromToken_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getUserFromToken_result result = new getUserFromToken_result(); if (e instanceof TInvalidTokenException) { - result.failure = (TInvalidTokenException) e; - result.setFailureIsSet(true); - msg = result; - } - else - { + result.failure = (TInvalidTokenException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2945,12 +3114,12 @@ public class MasterServer { return false; } - public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.getUserFromToken(args.token,resultHandler); } } - public static class isServerAuthenticated extends org.apache.thrift.AsyncProcessFunction { + public static class isServerAuthenticated extends org.apache.thrift.AsyncProcessFunction { public isServerAuthenticated() { super("isServerAuthenticated"); } @@ -2959,36 +3128,46 @@ public class MasterServer { return new isServerAuthenticated_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { - public void onComplete(Boolean o) { + return new org.apache.thrift.async.AsyncMethodCallback() { + public void onComplete(java.lang.Boolean o) { isServerAuthenticated_result result = new isServerAuthenticated_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; isServerAuthenticated_result result = new isServerAuthenticated_result(); - { + if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -2997,12 +3176,12 @@ public class MasterServer { return false; } - public void start(I iface, isServerAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, isServerAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.isServerAuthenticated(args.serverSessionId,resultHandler); } } - public static class startServerAuthentication extends org.apache.thrift.AsyncProcessFunction { + public static class startServerAuthentication extends org.apache.thrift.AsyncProcessFunction { public startServerAuthentication() { super("startServerAuthentication"); } @@ -3011,46 +3190,53 @@ public class MasterServer { return new startServerAuthentication_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { - public void onComplete(ByteBuffer o) { + return new org.apache.thrift.async.AsyncMethodCallback() { + public void onComplete(java.nio.ByteBuffer o) { startServerAuthentication_result result = new startServerAuthentication_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; startServerAuthentication_result result = new startServerAuthentication_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3059,7 +3245,7 @@ public class MasterServer { return false; } - public void start(I iface, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.startServerAuthentication(args.satelliteId,resultHandler); } } @@ -3073,46 +3259,53 @@ public class MasterServer { return new serverAuthenticate_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(ServerSessionData o) { serverAuthenticate_result result = new serverAuthenticate_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; serverAuthenticate_result result = new serverAuthenticate_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.errr = (TInvocationException) e; - result.setErrrIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.errr = (TInvocationException) e; + result.setErrrIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3121,7 +3314,7 @@ public class MasterServer { return false; } - public void start(I iface, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.serverAuthenticate(args.satelliteId, args.challengeResponse,resultHandler); } } @@ -3135,51 +3328,57 @@ public class MasterServer { return new getImageData_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(ImagePublishData o) { getImageData_result result = new getImageData_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getImageData_result result = new getImageData_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.failure2 = (TInvocationException) e; - result.setFailure2IsSet(true); - msg = result; - } - else if (e instanceof TNotFoundException) { - result.f3 = (TNotFoundException) e; - result.setF3IsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.failure2 = (TInvocationException) e; + result.setFailure2IsSet(true); + msg = result; + } else if (e instanceof TNotFoundException) { + result.f3 = (TNotFoundException) e; + result.setF3IsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3188,7 +3387,7 @@ public class MasterServer { return false; } - public void start(I iface, getImageData_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, getImageData_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.getImageData(args.serverSessionId, args.imageVersionId,resultHandler); } } @@ -3202,51 +3401,57 @@ public class MasterServer { return new submitImage_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(TransferInformation o) { submitImage_result result = new submitImage_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; submitImage_result result = new submitImage_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.failure2 = (TInvocationException) e; - result.setFailure2IsSet(true); - msg = result; - } - else if (e instanceof TTransferRejectedException) { - result.failure3 = (TTransferRejectedException) e; - result.setFailure3IsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.failure2 = (TInvocationException) e; + result.setFailure2IsSet(true); + msg = result; + } else if (e instanceof TTransferRejectedException) { + result.failure3 = (TTransferRejectedException) e; + result.setFailure3IsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3255,12 +3460,12 @@ public class MasterServer { return false; } - public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.submitImage(args.userToken, args.imageDescription, args.blockHashes,resultHandler); } } - public static class registerSatellite extends org.apache.thrift.AsyncProcessFunction { + public static class registerSatellite extends org.apache.thrift.AsyncProcessFunction { public registerSatellite() { super("registerSatellite"); } @@ -3269,42 +3474,50 @@ public class MasterServer { return new registerSatellite_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { - public void onComplete(Integer o) { + return new org.apache.thrift.async.AsyncMethodCallback() { + public void onComplete(java.lang.Integer o) { registerSatellite_result result = new registerSatellite_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; registerSatellite_result result = new registerSatellite_result(); if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3313,12 +3526,12 @@ public class MasterServer { return false; } - public void start(I iface, registerSatellite_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, registerSatellite_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.registerSatellite(args.userToken, args.displayName, args.addresses, args.modulus, args.exponent, args.certsha256,resultHandler); } } - public static class updateSatellite extends org.apache.thrift.AsyncProcessFunction { + public static class updateSatellite extends org.apache.thrift.AsyncProcessFunction { public updateSatellite() { super("updateSatellite"); } @@ -3327,47 +3540,54 @@ public class MasterServer { return new updateSatellite_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { - public void onComplete(Boolean o) { + return new org.apache.thrift.async.AsyncMethodCallback() { + public void onComplete(java.lang.Boolean o) { updateSatellite_result result = new updateSatellite_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; updateSatellite_result result = new updateSatellite_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.error = (TInvocationException) e; - result.setErrorIsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.error = (TInvocationException) e; + result.setErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3376,7 +3596,7 @@ public class MasterServer { return false; } - public void start(I iface, updateSatellite_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, updateSatellite_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.updateSatellite(args.serverSessionId, args.displayName, args.addresses,resultHandler); } } @@ -3390,51 +3610,57 @@ public class MasterServer { return new downloadImage_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(TransferInformation o) { downloadImage_result result = new downloadImage_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; downloadImage_result result = new downloadImage_result(); if (e instanceof TAuthorizationException) { - result.failure = (TAuthorizationException) e; - result.setFailureIsSet(true); - msg = result; - } - else if (e instanceof TInvocationException) { - result.failure2 = (TInvocationException) e; - result.setFailure2IsSet(true); - msg = result; - } - else if (e instanceof TNotFoundException) { - result.f3 = (TNotFoundException) e; - result.setF3IsSet(true); - msg = result; - } - else - { + result.failure = (TAuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } else if (e instanceof TInvocationException) { + result.failure2 = (TInvocationException) e; + result.setFailure2IsSet(true); + msg = result; + } else if (e instanceof TNotFoundException) { + result.f3 = (TNotFoundException) e; + result.setF3IsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3443,12 +3669,12 @@ public class MasterServer { return false; } - public void start(I iface, downloadImage_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, downloadImage_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.downloadImage(args.sessionId, args.imageVersionId,resultHandler); } } - public static class getOrganizations extends org.apache.thrift.AsyncProcessFunction> { + public static class getOrganizations extends org.apache.thrift.AsyncProcessFunction> { public getOrganizations() { super("getOrganizations"); } @@ -3457,41 +3683,49 @@ public class MasterServer { return new getOrganizations_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { getOrganizations_result result = new getOrganizations_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getOrganizations_result result = new getOrganizations_result(); if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3500,12 +3734,12 @@ public class MasterServer { return false; } - public void start(I iface, getOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, getOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.getOrganizations(resultHandler); } } - public static class getOperatingSystems extends org.apache.thrift.AsyncProcessFunction> { + public static class getOperatingSystems extends org.apache.thrift.AsyncProcessFunction> { public getOperatingSystems() { super("getOperatingSystems"); } @@ -3514,41 +3748,49 @@ public class MasterServer { return new getOperatingSystems_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { getOperatingSystems_result result = new getOperatingSystems_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getOperatingSystems_result result = new getOperatingSystems_result(); if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3557,12 +3799,12 @@ public class MasterServer { return false; } - public void start(I iface, getOperatingSystems_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, getOperatingSystems_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.getOperatingSystems(resultHandler); } } - public static class getVirtualizers extends org.apache.thrift.AsyncProcessFunction> { + public static class getVirtualizers extends org.apache.thrift.AsyncProcessFunction> { public getVirtualizers() { super("getVirtualizers"); } @@ -3571,41 +3813,49 @@ public class MasterServer { return new getVirtualizers_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { getVirtualizers_result result = new getVirtualizers_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getVirtualizers_result result = new getVirtualizers_result(); if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3614,12 +3864,12 @@ public class MasterServer { return false; } - public void start(I iface, getVirtualizers_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, getVirtualizers_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.getVirtualizers(resultHandler); } } - public static class getTags extends org.apache.thrift.AsyncProcessFunction> { + public static class getTags extends org.apache.thrift.AsyncProcessFunction> { public getTags() { super("getTags"); } @@ -3628,41 +3878,49 @@ public class MasterServer { return new getTags_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { getTags_result result = new getTags_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getTags_result result = new getTags_result(); if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3671,12 +3929,12 @@ public class MasterServer { return false; } - public void start(I iface, getTags_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, getTags_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.getTags(args.startDate,resultHandler); } } - public static class getSoftware extends org.apache.thrift.AsyncProcessFunction> { + public static class getSoftware extends org.apache.thrift.AsyncProcessFunction> { public getSoftware() { super("getSoftware"); } @@ -3685,41 +3943,49 @@ public class MasterServer { return new getSoftware_args(); } - public AsyncMethodCallback> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback>() { - public void onComplete(List o) { + return new org.apache.thrift.async.AsyncMethodCallback>() { + public void onComplete(java.util.List o) { getSoftware_result result = new getSoftware_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; getSoftware_result result = new getSoftware_result(); if (e instanceof TInvocationException) { - result.serverError = (TInvocationException) e; - result.setServerErrorIsSet(true); - msg = result; - } - else - { + result.serverError = (TInvocationException) e; + result.setServerErrorIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); 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()); + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3728,7 +3994,7 @@ public class MasterServer { return false; } - public void start(I iface, getSoftware_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws TException { + public void start(I iface, getSoftware_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { iface.getSoftware(args.startDate,resultHandler); } } @@ -3742,41 +4008,49 @@ public class MasterServer { return new queryUploadStatus_args(); } - public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(TransferStatus o) { queryUploadStatus_result result = new queryUploadStatus_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); + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); } - fb.close(); } - public void onError(Exception e) { + public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TBase msg; + org.apache.thrift.TSerializable msg; queryUploadStatus_result result = new queryUploadStatus_result(); if (e instanceof TInvalidTokenException) { - result.ex1 = (TInvalidTokenException) e; - result.setEx1IsSet(true); - msg = result; - } - else - { + result.ex1 = (TInvalidTokenException) e; + result.setEx1IsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; + } else { + _LOGGER.error("Exception inside handler", e); 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()); + msg = 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); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } - fb.close(); } }; } @@ -3785,7 +4059,7 @@ public class MasterServer { return false; } - public void start(I iface, queryUploadStatus_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + public void start(I iface, queryUploadStatus_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { iface.queryUploadStatus(args.uploadToken,resultHandler); } } @@ -3796,21 +4070,18 @@ public class MasterServer { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args"); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ping_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ping_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ping_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_argsTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -3818,6 +4089,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { default: @@ -3831,21 +4103,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -3854,14 +4127,14 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap); } @@ -3882,32 +4155,31 @@ public class MasterServer { public void clear() { } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof ping_args) return this.equals((ping_args)that); return false; @@ -3916,15 +4188,17 @@ public class MasterServer { public boolean equals(ping_args that) { if (that == null) return false; + if (this == that) + return true; return true; } @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - return list.hashCode(); + return hashCode; } @Override @@ -3938,21 +4212,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("ping_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ping_args("); boolean first = true; sb.append(")"); @@ -3972,7 +4247,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -3980,13 +4255,13 @@ public class MasterServer { } } - private static class ping_argsStandardSchemeFactory implements SchemeFactory { + private static class ping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ping_argsStandardScheme getScheme() { return new ping_argsStandardScheme(); } } - private static class ping_argsStandardScheme extends StandardScheme { + private static class ping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, ping_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -4019,25 +4294,28 @@ public class MasterServer { } - private static class ping_argsTupleSchemeFactory implements SchemeFactory { + private static class ping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ping_argsTupleScheme getScheme() { return new ping_argsTupleScheme(); } } - private static class ping_argsTupleScheme extends TupleScheme { + private static class ping_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class ping_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -4045,11 +4323,8 @@ public class MasterServer { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ping_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ping_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ping_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_resultTupleSchemeFactory(); public boolean success; // required @@ -4057,10 +4332,10 @@ public class MasterServer { public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4068,6 +4343,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -4083,21 +4359,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -4106,7 +4383,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -4114,12 +4391,12 @@ public class MasterServer { // 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; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap); } @@ -4163,57 +4440,56 @@ public class MasterServer { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.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); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((Boolean)value); + setSuccess((java.lang.Boolean)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return isSuccess(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case SUCCESS: return isSetSuccess(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof ping_result) return this.equals((ping_result)that); return false; @@ -4222,6 +4498,8 @@ public class MasterServer { public boolean equals(ping_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true; boolean that_present_success = true; @@ -4237,14 +4515,11 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true; - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((success) ? 131071 : 524287); - return list.hashCode(); + return hashCode; } @Override @@ -4255,7 +4530,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -4268,21 +4543,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("ping_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ping_result("); boolean first = true; sb.append("success:"); @@ -4305,7 +4581,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -4315,13 +4591,13 @@ public class MasterServer { } } - private static class ping_resultStandardSchemeFactory implements SchemeFactory { + private static class ping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ping_resultStandardScheme getScheme() { return new ping_resultStandardScheme(); } } - private static class ping_resultStandardScheme extends StandardScheme { + private static class ping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, ping_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -4367,18 +4643,18 @@ public class MasterServer { } - private static class ping_resultTupleSchemeFactory implements SchemeFactory { + private static class ping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ping_resultTupleScheme getScheme() { return new ping_resultTupleScheme(); } } - private static class ping_resultTupleScheme extends TupleScheme { + private static class ping_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ping_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -4390,8 +4666,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, ping_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = iprot.readBool(); struct.setSuccessIsSet(true); @@ -4399,6 +4675,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class authenticate_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -4407,24 +4686,21 @@ public class MasterServer { 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 PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new authenticate_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new authenticate_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new authenticate_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new authenticate_argsTupleSchemeFactory(); - public String login; // required - public String password; // required + public @org.apache.thrift.annotation.Nullable java.lang.String login; // required + public @org.apache.thrift.annotation.Nullable java.lang.String password; // 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"), PASSWORD((short)2, "password"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4432,6 +4708,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // LOGIN @@ -4449,21 +4726,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -4472,20 +4750,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticate_args.class, metaDataMap); } @@ -4493,8 +4771,8 @@ public class MasterServer { } public authenticate_args( - String login, - String password) + java.lang.String login, + java.lang.String password) { this(); this.login = login; @@ -4523,11 +4801,12 @@ public class MasterServer { this.password = null; } - public String getLogin() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getLogin() { return this.login; } - public authenticate_args setLogin(String login) { + public authenticate_args setLogin(@org.apache.thrift.annotation.Nullable java.lang.String login) { this.login = login; return this; } @@ -4547,11 +4826,12 @@ public class MasterServer { } } - public String getPassword() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getPassword() { return this.password; } - public authenticate_args setPassword(String password) { + public authenticate_args setPassword(@org.apache.thrift.annotation.Nullable java.lang.String password) { this.password = password; return this; } @@ -4571,13 +4851,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case LOGIN: if (value == null) { unsetLogin(); } else { - setLogin((String)value); + setLogin((java.lang.String)value); } break; @@ -4585,14 +4865,15 @@ public class MasterServer { if (value == null) { unsetPassword(); } else { - setPassword((String)value); + setPassword((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case LOGIN: return getLogin(); @@ -4601,13 +4882,13 @@ public class MasterServer { return getPassword(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -4616,13 +4897,11 @@ public class MasterServer { case PASSWORD: return isSetPassword(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof authenticate_args) return this.equals((authenticate_args)that); return false; @@ -4631,6 +4910,8 @@ public class MasterServer { public boolean equals(authenticate_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_login = true && this.isSetLogin(); boolean that_present_login = true && that.isSetLogin(); @@ -4655,19 +4936,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_login = true && (isSetLogin()); - list.add(present_login); - if (present_login) - list.add(login); + hashCode = hashCode * 8191 + ((isSetLogin()) ? 131071 : 524287); + if (isSetLogin()) + hashCode = hashCode * 8191 + login.hashCode(); - boolean present_password = true && (isSetPassword()); - list.add(present_password); - if (present_password) - list.add(password); + hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287); + if (isSetPassword()) + hashCode = hashCode * 8191 + password.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -4678,7 +4957,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); + lastComparison = java.lang.Boolean.compare(isSetLogin(), other.isSetLogin()); if (lastComparison != 0) { return lastComparison; } @@ -4688,7 +4967,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword()); + lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword()); if (lastComparison != 0) { return lastComparison; } @@ -4701,21 +4980,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("authenticate_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("authenticate_args("); boolean first = true; sb.append("login:"); @@ -4750,7 +5030,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -4758,13 +5038,13 @@ public class MasterServer { } } - private static class authenticate_argsStandardSchemeFactory implements SchemeFactory { + private static class authenticate_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public authenticate_argsStandardScheme getScheme() { return new authenticate_argsStandardScheme(); } } - private static class authenticate_argsStandardScheme extends StandardScheme { + private static class authenticate_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, authenticate_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -4823,18 +5103,18 @@ public class MasterServer { } - private static class authenticate_argsTupleSchemeFactory implements SchemeFactory { + private static class authenticate_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public authenticate_argsTupleScheme getScheme() { return new authenticate_argsTupleScheme(); } } - private static class authenticate_argsTupleScheme extends TupleScheme { + private static class authenticate_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, authenticate_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetLogin()) { optionals.set(0); } @@ -4852,8 +5132,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, authenticate_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.login = iprot.readString(); struct.setLoginIsSet(true); @@ -4865,6 +5145,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class authenticate_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -4874,15 +5157,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new authenticate_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new authenticate_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new authenticate_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new authenticate_resultTupleSchemeFactory(); - public SessionData success; // required - public TAuthorizationException failure; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable SessionData success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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 { @@ -4890,10 +5170,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERROR((short)2, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -4901,6 +5181,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -4920,21 +5201,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -4943,22 +5225,22 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionData.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticate_result.class, metaDataMap); } @@ -5002,11 +5284,12 @@ public class MasterServer { this.error = null; } + @org.apache.thrift.annotation.Nullable public SessionData getSuccess() { return this.success; } - public authenticate_result setSuccess(SessionData success) { + public authenticate_result setSuccess(@org.apache.thrift.annotation.Nullable SessionData success) { this.success = success; return this; } @@ -5026,11 +5309,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public authenticate_result setFailure(TAuthorizationException failure) { + public authenticate_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -5050,11 +5334,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public authenticate_result setError(TInvocationException error) { + public authenticate_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -5074,7 +5359,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -5103,7 +5388,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -5115,13 +5401,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -5132,13 +5418,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof authenticate_result) return this.equals((authenticate_result)that); return false; @@ -5147,6 +5431,8 @@ public class MasterServer { public boolean equals(authenticate_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -5180,24 +5466,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -5208,7 +5491,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -5218,7 +5501,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -5228,7 +5511,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -5241,21 +5524,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("authenticate_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("authenticate_result("); boolean first = true; sb.append("success:"); @@ -5301,7 +5585,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -5309,13 +5593,13 @@ public class MasterServer { } } - private static class authenticate_resultStandardSchemeFactory implements SchemeFactory { + private static class authenticate_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public authenticate_resultStandardScheme getScheme() { return new authenticate_resultStandardScheme(); } } - private static class authenticate_resultStandardScheme extends StandardScheme { + private static class authenticate_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, authenticate_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -5390,18 +5674,18 @@ public class MasterServer { } - private static class authenticate_resultTupleSchemeFactory implements SchemeFactory { + private static class authenticate_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public authenticate_resultTupleScheme getScheme() { return new authenticate_resultTupleScheme(); } } - private static class authenticate_resultTupleScheme extends TupleScheme { + private static class authenticate_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, authenticate_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -5425,8 +5709,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, authenticate_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.success = new SessionData(); struct.success.read(iprot); @@ -5445,6 +5729,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class localAccountLogin_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -5453,24 +5740,21 @@ public class MasterServer { 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 PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new localAccountLogin_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new localAccountLogin_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new localAccountLogin_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new localAccountLogin_argsTupleSchemeFactory(); - public String login; // required - public String password; // required + public @org.apache.thrift.annotation.Nullable java.lang.String login; // required + public @org.apache.thrift.annotation.Nullable java.lang.String password; // 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"), PASSWORD((short)2, "password"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -5478,6 +5762,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // LOGIN @@ -5495,21 +5780,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -5518,20 +5804,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(localAccountLogin_args.class, metaDataMap); } @@ -5539,8 +5825,8 @@ public class MasterServer { } public localAccountLogin_args( - String login, - String password) + java.lang.String login, + java.lang.String password) { this(); this.login = login; @@ -5569,11 +5855,12 @@ public class MasterServer { this.password = null; } - public String getLogin() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getLogin() { return this.login; } - public localAccountLogin_args setLogin(String login) { + public localAccountLogin_args setLogin(@org.apache.thrift.annotation.Nullable java.lang.String login) { this.login = login; return this; } @@ -5593,11 +5880,12 @@ public class MasterServer { } } - public String getPassword() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getPassword() { return this.password; } - public localAccountLogin_args setPassword(String password) { + public localAccountLogin_args setPassword(@org.apache.thrift.annotation.Nullable java.lang.String password) { this.password = password; return this; } @@ -5617,13 +5905,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case LOGIN: if (value == null) { unsetLogin(); } else { - setLogin((String)value); + setLogin((java.lang.String)value); } break; @@ -5631,14 +5919,15 @@ public class MasterServer { if (value == null) { unsetPassword(); } else { - setPassword((String)value); + setPassword((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case LOGIN: return getLogin(); @@ -5647,13 +5936,13 @@ public class MasterServer { return getPassword(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -5662,13 +5951,11 @@ public class MasterServer { case PASSWORD: return isSetPassword(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof localAccountLogin_args) return this.equals((localAccountLogin_args)that); return false; @@ -5677,6 +5964,8 @@ public class MasterServer { public boolean equals(localAccountLogin_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_login = true && this.isSetLogin(); boolean that_present_login = true && that.isSetLogin(); @@ -5701,19 +5990,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_login = true && (isSetLogin()); - list.add(present_login); - if (present_login) - list.add(login); + hashCode = hashCode * 8191 + ((isSetLogin()) ? 131071 : 524287); + if (isSetLogin()) + hashCode = hashCode * 8191 + login.hashCode(); - boolean present_password = true && (isSetPassword()); - list.add(present_password); - if (present_password) - list.add(password); + hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287); + if (isSetPassword()) + hashCode = hashCode * 8191 + password.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -5724,7 +6011,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); + lastComparison = java.lang.Boolean.compare(isSetLogin(), other.isSetLogin()); if (lastComparison != 0) { return lastComparison; } @@ -5734,7 +6021,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword()); + lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword()); if (lastComparison != 0) { return lastComparison; } @@ -5747,21 +6034,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("localAccountLogin_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("localAccountLogin_args("); boolean first = true; sb.append("login:"); @@ -5796,7 +6084,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -5804,13 +6092,13 @@ public class MasterServer { } } - private static class localAccountLogin_argsStandardSchemeFactory implements SchemeFactory { + private static class localAccountLogin_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public localAccountLogin_argsStandardScheme getScheme() { return new localAccountLogin_argsStandardScheme(); } } - private static class localAccountLogin_argsStandardScheme extends StandardScheme { + private static class localAccountLogin_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, localAccountLogin_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -5869,18 +6157,18 @@ public class MasterServer { } - private static class localAccountLogin_argsTupleSchemeFactory implements SchemeFactory { + private static class localAccountLogin_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public localAccountLogin_argsTupleScheme getScheme() { return new localAccountLogin_argsTupleScheme(); } } - private static class localAccountLogin_argsTupleScheme extends TupleScheme { + private static class localAccountLogin_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetLogin()) { optionals.set(0); } @@ -5898,8 +6186,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.login = iprot.readString(); struct.setLoginIsSet(true); @@ -5911,6 +6199,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class localAccountLogin_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -5920,15 +6211,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new localAccountLogin_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new localAccountLogin_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new localAccountLogin_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new localAccountLogin_resultTupleSchemeFactory(); - public ClientSessionData success; // required - public TAuthorizationException failure; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable ClientSessionData success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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 { @@ -5936,10 +6224,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERROR((short)2, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -5947,6 +6235,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -5966,21 +6255,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -5989,22 +6279,22 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ClientSessionData.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(localAccountLogin_result.class, metaDataMap); } @@ -6048,11 +6338,12 @@ public class MasterServer { this.error = null; } + @org.apache.thrift.annotation.Nullable public ClientSessionData getSuccess() { return this.success; } - public localAccountLogin_result setSuccess(ClientSessionData success) { + public localAccountLogin_result setSuccess(@org.apache.thrift.annotation.Nullable ClientSessionData success) { this.success = success; return this; } @@ -6072,11 +6363,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public localAccountLogin_result setFailure(TAuthorizationException failure) { + public localAccountLogin_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -6096,11 +6388,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public localAccountLogin_result setError(TInvocationException error) { + public localAccountLogin_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -6120,7 +6413,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -6149,7 +6442,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -6161,13 +6455,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -6178,13 +6472,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof localAccountLogin_result) return this.equals((localAccountLogin_result)that); return false; @@ -6193,6 +6485,8 @@ public class MasterServer { public boolean equals(localAccountLogin_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -6226,24 +6520,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -6254,7 +6545,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -6264,7 +6555,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -6274,7 +6565,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -6287,21 +6578,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("localAccountLogin_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("localAccountLogin_result("); boolean first = true; sb.append("success:"); @@ -6347,7 +6639,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -6355,13 +6647,13 @@ public class MasterServer { } } - private static class localAccountLogin_resultStandardSchemeFactory implements SchemeFactory { + private static class localAccountLogin_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public localAccountLogin_resultStandardScheme getScheme() { return new localAccountLogin_resultStandardScheme(); } } - private static class localAccountLogin_resultStandardScheme extends StandardScheme { + private static class localAccountLogin_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, localAccountLogin_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -6436,18 +6728,18 @@ public class MasterServer { } - private static class localAccountLogin_resultTupleSchemeFactory implements SchemeFactory { + private static class localAccountLogin_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public localAccountLogin_resultTupleScheme getScheme() { return new localAccountLogin_resultTupleScheme(); } } - private static class localAccountLogin_resultTupleScheme extends TupleScheme { + private static class localAccountLogin_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -6471,8 +6763,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.success = new ClientSessionData(); struct.success.read(iprot); @@ -6491,6 +6783,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class setUsedSatellite_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -6499,24 +6794,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField SATELLITE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("satelliteName", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new setUsedSatellite_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new setUsedSatellite_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUsedSatellite_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUsedSatellite_argsTupleSchemeFactory(); - public String sessionId; // required - public String satelliteName; // required + public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String satelliteName; // 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 { SESSION_ID((short)1, "sessionId"), SATELLITE_NAME((short)2, "satelliteName"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -6524,6 +6816,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SESSION_ID @@ -6541,21 +6834,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -6564,20 +6858,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.SATELLITE_NAME, new org.apache.thrift.meta_data.FieldMetaData("satelliteName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUsedSatellite_args.class, metaDataMap); } @@ -6585,8 +6879,8 @@ public class MasterServer { } public setUsedSatellite_args( - String sessionId, - String satelliteName) + java.lang.String sessionId, + java.lang.String satelliteName) { this(); this.sessionId = sessionId; @@ -6615,11 +6909,12 @@ public class MasterServer { this.satelliteName = null; } - public String getSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSessionId() { return this.sessionId; } - public setUsedSatellite_args setSessionId(String sessionId) { + public setUsedSatellite_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) { this.sessionId = sessionId; return this; } @@ -6639,11 +6934,12 @@ public class MasterServer { } } - public String getSatelliteName() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSatelliteName() { return this.satelliteName; } - public setUsedSatellite_args setSatelliteName(String satelliteName) { + public setUsedSatellite_args setSatelliteName(@org.apache.thrift.annotation.Nullable java.lang.String satelliteName) { this.satelliteName = satelliteName; return this; } @@ -6663,13 +6959,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SESSION_ID: if (value == null) { unsetSessionId(); } else { - setSessionId((String)value); + setSessionId((java.lang.String)value); } break; @@ -6677,14 +6973,15 @@ public class MasterServer { if (value == null) { unsetSatelliteName(); } else { - setSatelliteName((String)value); + setSatelliteName((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SESSION_ID: return getSessionId(); @@ -6693,13 +6990,13 @@ public class MasterServer { return getSatelliteName(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -6708,13 +7005,11 @@ public class MasterServer { case SATELLITE_NAME: return isSetSatelliteName(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof setUsedSatellite_args) return this.equals((setUsedSatellite_args)that); return false; @@ -6723,6 +7018,8 @@ public class MasterServer { public boolean equals(setUsedSatellite_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_sessionId = true && this.isSetSessionId(); boolean that_present_sessionId = true && that.isSetSessionId(); @@ -6747,19 +7044,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_sessionId = true && (isSetSessionId()); - list.add(present_sessionId); - if (present_sessionId) - list.add(sessionId); + hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287); + if (isSetSessionId()) + hashCode = hashCode * 8191 + sessionId.hashCode(); - boolean present_satelliteName = true && (isSetSatelliteName()); - list.add(present_satelliteName); - if (present_satelliteName) - list.add(satelliteName); + hashCode = hashCode * 8191 + ((isSetSatelliteName()) ? 131071 : 524287); + if (isSetSatelliteName()) + hashCode = hashCode * 8191 + satelliteName.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -6770,7 +7065,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -6780,7 +7075,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSatelliteName()).compareTo(other.isSetSatelliteName()); + lastComparison = java.lang.Boolean.compare(isSetSatelliteName(), other.isSetSatelliteName()); if (lastComparison != 0) { return lastComparison; } @@ -6793,21 +7088,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("setUsedSatellite_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("setUsedSatellite_args("); boolean first = true; sb.append("sessionId:"); @@ -6842,7 +7138,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -6850,13 +7146,13 @@ public class MasterServer { } } - private static class setUsedSatellite_argsStandardSchemeFactory implements SchemeFactory { + private static class setUsedSatellite_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public setUsedSatellite_argsStandardScheme getScheme() { return new setUsedSatellite_argsStandardScheme(); } } - private static class setUsedSatellite_argsStandardScheme extends StandardScheme { + private static class setUsedSatellite_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, setUsedSatellite_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -6915,18 +7211,18 @@ public class MasterServer { } - private static class setUsedSatellite_argsTupleSchemeFactory implements SchemeFactory { + private static class setUsedSatellite_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public setUsedSatellite_argsTupleScheme getScheme() { return new setUsedSatellite_argsTupleScheme(); } } - private static class setUsedSatellite_argsTupleScheme extends TupleScheme { + private static class setUsedSatellite_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSessionId()) { optionals.set(0); } @@ -6944,8 +7240,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.sessionId = iprot.readString(); struct.setSessionIdIsSet(true); @@ -6957,27 +7253,27 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class setUsedSatellite_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setUsedSatellite_result"); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new setUsedSatellite_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new setUsedSatellite_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUsedSatellite_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUsedSatellite_resultTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -6985,6 +7281,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { default: @@ -6998,21 +7295,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -7021,14 +7319,14 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUsedSatellite_result.class, metaDataMap); } @@ -7049,32 +7347,31 @@ public class MasterServer { public void clear() { } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof setUsedSatellite_result) return this.equals((setUsedSatellite_result)that); return false; @@ -7083,15 +7380,17 @@ public class MasterServer { public boolean equals(setUsedSatellite_result that) { if (that == null) return false; + if (this == that) + return true; return true; } @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - return list.hashCode(); + return hashCode; } @Override @@ -7105,21 +7404,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("setUsedSatellite_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("setUsedSatellite_result("); boolean first = true; sb.append(")"); @@ -7139,7 +7439,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -7147,13 +7447,13 @@ public class MasterServer { } } - private static class setUsedSatellite_resultStandardSchemeFactory implements SchemeFactory { + private static class setUsedSatellite_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public setUsedSatellite_resultStandardScheme getScheme() { return new setUsedSatellite_resultStandardScheme(); } } - private static class setUsedSatellite_resultStandardScheme extends StandardScheme { + private static class setUsedSatellite_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, setUsedSatellite_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -7186,25 +7486,28 @@ public class MasterServer { } - private static class setUsedSatellite_resultTupleSchemeFactory implements SchemeFactory { + private static class setUsedSatellite_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public setUsedSatellite_resultTupleScheme getScheme() { return new setUsedSatellite_resultTupleScheme(); } } - private static class setUsedSatellite_resultTupleScheme extends TupleScheme { + private static class setUsedSatellite_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override public void read(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class findUser_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -7214,15 +7517,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField ORGANIZATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("organizationId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField SEARCH_TERM_FIELD_DESC = new org.apache.thrift.protocol.TField("searchTerm", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new findUser_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new findUser_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new findUser_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new findUser_argsTupleSchemeFactory(); - public String sessionId; // required - public String organizationId; // required - public String searchTerm; // required + public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String organizationId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String searchTerm; // 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 { @@ -7230,10 +7530,10 @@ public class MasterServer { ORGANIZATION_ID((short)2, "organizationId"), SEARCH_TERM((short)3, "searchTerm"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -7241,6 +7541,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SESSION_ID @@ -7260,21 +7561,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -7283,22 +7585,22 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.ORGANIZATION_ID, new org.apache.thrift.meta_data.FieldMetaData("organizationId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SEARCH_TERM, new org.apache.thrift.meta_data.FieldMetaData("searchTerm", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(findUser_args.class, metaDataMap); } @@ -7306,9 +7608,9 @@ public class MasterServer { } public findUser_args( - String sessionId, - String organizationId, - String searchTerm) + java.lang.String sessionId, + java.lang.String organizationId, + java.lang.String searchTerm) { this(); this.sessionId = sessionId; @@ -7342,11 +7644,12 @@ public class MasterServer { this.searchTerm = null; } - public String getSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSessionId() { return this.sessionId; } - public findUser_args setSessionId(String sessionId) { + public findUser_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) { this.sessionId = sessionId; return this; } @@ -7366,11 +7669,12 @@ public class MasterServer { } } - public String getOrganizationId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getOrganizationId() { return this.organizationId; } - public findUser_args setOrganizationId(String organizationId) { + public findUser_args setOrganizationId(@org.apache.thrift.annotation.Nullable java.lang.String organizationId) { this.organizationId = organizationId; return this; } @@ -7390,11 +7694,12 @@ public class MasterServer { } } - public String getSearchTerm() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSearchTerm() { return this.searchTerm; } - public findUser_args setSearchTerm(String searchTerm) { + public findUser_args setSearchTerm(@org.apache.thrift.annotation.Nullable java.lang.String searchTerm) { this.searchTerm = searchTerm; return this; } @@ -7414,13 +7719,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SESSION_ID: if (value == null) { unsetSessionId(); } else { - setSessionId((String)value); + setSessionId((java.lang.String)value); } break; @@ -7428,7 +7733,7 @@ public class MasterServer { if (value == null) { unsetOrganizationId(); } else { - setOrganizationId((String)value); + setOrganizationId((java.lang.String)value); } break; @@ -7436,14 +7741,15 @@ public class MasterServer { if (value == null) { unsetSearchTerm(); } else { - setSearchTerm((String)value); + setSearchTerm((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SESSION_ID: return getSessionId(); @@ -7455,13 +7761,13 @@ public class MasterServer { return getSearchTerm(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -7472,13 +7778,11 @@ public class MasterServer { case SEARCH_TERM: return isSetSearchTerm(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof findUser_args) return this.equals((findUser_args)that); return false; @@ -7487,6 +7791,8 @@ public class MasterServer { public boolean equals(findUser_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_sessionId = true && this.isSetSessionId(); boolean that_present_sessionId = true && that.isSetSessionId(); @@ -7520,24 +7826,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_sessionId = true && (isSetSessionId()); - list.add(present_sessionId); - if (present_sessionId) - list.add(sessionId); + hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287); + if (isSetSessionId()) + hashCode = hashCode * 8191 + sessionId.hashCode(); - boolean present_organizationId = true && (isSetOrganizationId()); - list.add(present_organizationId); - if (present_organizationId) - list.add(organizationId); + hashCode = hashCode * 8191 + ((isSetOrganizationId()) ? 131071 : 524287); + if (isSetOrganizationId()) + hashCode = hashCode * 8191 + organizationId.hashCode(); - boolean present_searchTerm = true && (isSetSearchTerm()); - list.add(present_searchTerm); - if (present_searchTerm) - list.add(searchTerm); + hashCode = hashCode * 8191 + ((isSetSearchTerm()) ? 131071 : 524287); + if (isSetSearchTerm()) + hashCode = hashCode * 8191 + searchTerm.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -7548,7 +7851,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -7558,7 +7861,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId()); + lastComparison = java.lang.Boolean.compare(isSetOrganizationId(), other.isSetOrganizationId()); if (lastComparison != 0) { return lastComparison; } @@ -7568,7 +7871,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSearchTerm()).compareTo(other.isSetSearchTerm()); + lastComparison = java.lang.Boolean.compare(isSetSearchTerm(), other.isSetSearchTerm()); if (lastComparison != 0) { return lastComparison; } @@ -7581,21 +7884,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("findUser_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("findUser_args("); boolean first = true; sb.append("sessionId:"); @@ -7638,7 +7942,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -7646,13 +7950,13 @@ public class MasterServer { } } - private static class findUser_argsStandardSchemeFactory implements SchemeFactory { + private static class findUser_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public findUser_argsStandardScheme getScheme() { return new findUser_argsStandardScheme(); } } - private static class findUser_argsStandardScheme extends StandardScheme { + private static class findUser_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, findUser_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -7724,18 +8028,18 @@ public class MasterServer { } - private static class findUser_argsTupleSchemeFactory implements SchemeFactory { + private static class findUser_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public findUser_argsTupleScheme getScheme() { return new findUser_argsTupleScheme(); } } - private static class findUser_argsTupleScheme extends TupleScheme { + private static class findUser_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, findUser_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSessionId()) { optionals.set(0); } @@ -7759,8 +8063,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, findUser_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.sessionId = iprot.readString(); struct.setSessionIdIsSet(true); @@ -7776,6 +8080,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class findUser_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -7785,15 +8092,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new findUser_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new findUser_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new findUser_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new findUser_resultTupleSchemeFactory(); - public List success; // required - public TAuthorizationException failure; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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 { @@ -7801,10 +8105,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERROR((short)2, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -7812,6 +8116,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -7831,21 +8136,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -7854,23 +8160,23 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(findUser_result.class, metaDataMap); } @@ -7878,7 +8184,7 @@ public class MasterServer { } public findUser_result( - List success, + java.util.List success, TAuthorizationException failure, TInvocationException error) { @@ -7893,7 +8199,7 @@ public class MasterServer { */ public findUser_result(findUser_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (UserInfo other_element : other.success) { __this__success.add(new UserInfo(other_element)); } @@ -7922,22 +8228,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(UserInfo elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public findUser_result setSuccess(List success) { + public findUser_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -7957,11 +8265,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public findUser_result setFailure(TAuthorizationException failure) { + public findUser_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -7981,11 +8290,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public findUser_result setError(TInvocationException error) { + public findUser_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -8005,13 +8315,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -8034,7 +8344,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -8046,13 +8357,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -8063,13 +8374,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof findUser_result) return this.equals((findUser_result)that); return false; @@ -8078,6 +8387,8 @@ public class MasterServer { public boolean equals(findUser_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -8111,24 +8422,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -8139,7 +8447,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -8149,7 +8457,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -8159,7 +8467,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -8172,21 +8480,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("findUser_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("findUser_result("); boolean first = true; sb.append("success:"); @@ -8229,7 +8538,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -8237,13 +8546,13 @@ public class MasterServer { } } - private static class findUser_resultStandardSchemeFactory implements SchemeFactory { + private static class findUser_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public findUser_resultStandardScheme getScheme() { return new findUser_resultStandardScheme(); } } - private static class findUser_resultStandardScheme extends StandardScheme { + private static class findUser_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, findUser_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -8258,14 +8567,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list306 = iprot.readListBegin(); - struct.success = new ArrayList(_list306.size); - UserInfo _elem307; - for (int _i308 = 0; _i308 < _list306.size; ++_i308) + org.apache.thrift.protocol.TList _list418 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list418.size); + @org.apache.thrift.annotation.Nullable UserInfo _elem419; + for (int _i420 = 0; _i420 < _list418.size; ++_i420) { - _elem307 = new UserInfo(); - _elem307.read(iprot); - struct.success.add(_elem307); + _elem419 = new UserInfo(); + _elem419.read(iprot); + struct.success.add(_elem419); } iprot.readListEnd(); } @@ -8311,9 +8620,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (UserInfo _iter309 : struct.success) + for (UserInfo _iter421 : struct.success) { - _iter309.write(oprot); + _iter421.write(oprot); } oprot.writeListEnd(); } @@ -8335,18 +8644,18 @@ public class MasterServer { } - private static class findUser_resultTupleSchemeFactory implements SchemeFactory { + private static class findUser_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public findUser_resultTupleScheme getScheme() { return new findUser_resultTupleScheme(); } } - private static class findUser_resultTupleScheme extends TupleScheme { + private static class findUser_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, findUser_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -8360,9 +8669,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (UserInfo _iter310 : struct.success) + for (UserInfo _iter422 : struct.success) { - _iter310.write(oprot); + _iter422.write(oprot); } } } @@ -8376,18 +8685,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, findUser_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list311 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list311.size); - UserInfo _elem312; - for (int _i313 = 0; _i313 < _list311.size; ++_i313) + org.apache.thrift.protocol.TList _list423 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list423.size); + @org.apache.thrift.annotation.Nullable UserInfo _elem424; + for (int _i425 = 0; _i425 < _list423.size; ++_i425) { - _elem312 = new UserInfo(); - _elem312.read(iprot); - struct.success.add(_elem312); + _elem424 = new UserInfo(); + _elem424.read(iprot); + struct.success.add(_elem424); } } struct.setSuccessIsSet(true); @@ -8405,6 +8714,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getPublicImages_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -8413,13 +8725,10 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField PAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("page", org.apache.thrift.protocol.TType.I32, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getPublicImages_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getPublicImages_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getPublicImages_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getPublicImages_argsTupleSchemeFactory(); - public String sessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required public int page; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -8427,10 +8736,10 @@ public class MasterServer { SESSION_ID((short)1, "sessionId"), PAGE((short)2, "page"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -8438,6 +8747,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SESSION_ID @@ -8455,21 +8765,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -8478,7 +8789,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -8486,14 +8797,14 @@ public class MasterServer { // isset id assignments private static final int __PAGE_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.PAGE, new org.apache.thrift.meta_data.FieldMetaData("page", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPublicImages_args.class, metaDataMap); } @@ -8501,7 +8812,7 @@ public class MasterServer { } public getPublicImages_args( - String sessionId, + java.lang.String sessionId, int page) { this(); @@ -8532,11 +8843,12 @@ public class MasterServer { this.page = 0; } - public String getSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSessionId() { return this.sessionId; } - public getPublicImages_args setSessionId(String sessionId) { + public getPublicImages_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) { this.sessionId = sessionId; return this; } @@ -8567,25 +8879,25 @@ public class MasterServer { } public void unsetPage() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID); } /** Returns true if field page is set (has been assigned a value) and false otherwise */ public boolean isSetPage() { - return EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID); } public void setPageIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SESSION_ID: if (value == null) { unsetSessionId(); } else { - setSessionId((String)value); + setSessionId((java.lang.String)value); } break; @@ -8593,14 +8905,15 @@ public class MasterServer { if (value == null) { unsetPage(); } else { - setPage((Integer)value); + setPage((java.lang.Integer)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SESSION_ID: return getSessionId(); @@ -8609,13 +8922,13 @@ public class MasterServer { return getPage(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -8624,13 +8937,11 @@ public class MasterServer { case PAGE: return isSetPage(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getPublicImages_args) return this.equals((getPublicImages_args)that); return false; @@ -8639,6 +8950,8 @@ public class MasterServer { public boolean equals(getPublicImages_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_sessionId = true && this.isSetSessionId(); boolean that_present_sessionId = true && that.isSetSessionId(); @@ -8663,19 +8976,15 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_sessionId = true && (isSetSessionId()); - list.add(present_sessionId); - if (present_sessionId) - list.add(sessionId); + hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287); + if (isSetSessionId()) + hashCode = hashCode * 8191 + sessionId.hashCode(); - boolean present_page = true; - list.add(present_page); - if (present_page) - list.add(page); + hashCode = hashCode * 8191 + page; - return list.hashCode(); + return hashCode; } @Override @@ -8686,7 +8995,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -8696,7 +9005,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage()); + lastComparison = java.lang.Boolean.compare(isSetPage(), other.isSetPage()); if (lastComparison != 0) { return lastComparison; } @@ -8709,21 +9018,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getPublicImages_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getPublicImages_args("); boolean first = true; sb.append("sessionId:"); @@ -8754,7 +9064,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -8764,13 +9074,13 @@ public class MasterServer { } } - private static class getPublicImages_argsStandardSchemeFactory implements SchemeFactory { + private static class getPublicImages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getPublicImages_argsStandardScheme getScheme() { return new getPublicImages_argsStandardScheme(); } } - private static class getPublicImages_argsStandardScheme extends StandardScheme { + private static class getPublicImages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getPublicImages_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -8827,18 +9137,18 @@ public class MasterServer { } - private static class getPublicImages_argsTupleSchemeFactory implements SchemeFactory { + private static class getPublicImages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getPublicImages_argsTupleScheme getScheme() { return new getPublicImages_argsTupleScheme(); } } - private static class getPublicImages_argsTupleScheme extends TupleScheme { + private static class getPublicImages_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getPublicImages_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSessionId()) { optionals.set(0); } @@ -8856,8 +9166,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPublicImages_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.sessionId = iprot.readString(); struct.setSessionIdIsSet(true); @@ -8869,6 +9179,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getPublicImages_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -8878,15 +9191,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getPublicImages_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getPublicImages_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getPublicImages_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getPublicImages_resultTupleSchemeFactory(); - public List success; // required - public TAuthorizationException failure; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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 { @@ -8894,10 +9204,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERROR((short)2, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -8905,6 +9215,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -8924,21 +9235,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -8947,23 +9259,23 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageSummaryRead.class)))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPublicImages_result.class, metaDataMap); } @@ -8971,7 +9283,7 @@ public class MasterServer { } public getPublicImages_result( - List success, + java.util.List success, TAuthorizationException failure, TInvocationException error) { @@ -8986,7 +9298,7 @@ public class MasterServer { */ public getPublicImages_result(getPublicImages_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (ImageSummaryRead other_element : other.success) { __this__success.add(new ImageSummaryRead(other_element)); } @@ -9015,22 +9327,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(ImageSummaryRead elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public getPublicImages_result setSuccess(List success) { + public getPublicImages_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -9050,11 +9364,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public getPublicImages_result setFailure(TAuthorizationException failure) { + public getPublicImages_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -9074,11 +9389,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public getPublicImages_result setError(TInvocationException error) { + public getPublicImages_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -9098,13 +9414,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -9127,7 +9443,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -9139,13 +9456,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -9156,13 +9473,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getPublicImages_result) return this.equals((getPublicImages_result)that); return false; @@ -9171,6 +9486,8 @@ public class MasterServer { public boolean equals(getPublicImages_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -9204,24 +9521,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -9232,7 +9546,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -9242,7 +9556,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -9252,7 +9566,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -9265,21 +9579,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getPublicImages_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getPublicImages_result("); boolean first = true; sb.append("success:"); @@ -9322,7 +9637,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -9330,13 +9645,13 @@ public class MasterServer { } } - private static class getPublicImages_resultStandardSchemeFactory implements SchemeFactory { + private static class getPublicImages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getPublicImages_resultStandardScheme getScheme() { return new getPublicImages_resultStandardScheme(); } } - private static class getPublicImages_resultStandardScheme extends StandardScheme { + private static class getPublicImages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getPublicImages_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -9351,14 +9666,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list314 = iprot.readListBegin(); - struct.success = new ArrayList(_list314.size); - ImageSummaryRead _elem315; - for (int _i316 = 0; _i316 < _list314.size; ++_i316) + org.apache.thrift.protocol.TList _list426 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list426.size); + @org.apache.thrift.annotation.Nullable ImageSummaryRead _elem427; + for (int _i428 = 0; _i428 < _list426.size; ++_i428) { - _elem315 = new ImageSummaryRead(); - _elem315.read(iprot); - struct.success.add(_elem315); + _elem427 = new ImageSummaryRead(); + _elem427.read(iprot); + struct.success.add(_elem427); } iprot.readListEnd(); } @@ -9404,9 +9719,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (ImageSummaryRead _iter317 : struct.success) + for (ImageSummaryRead _iter429 : struct.success) { - _iter317.write(oprot); + _iter429.write(oprot); } oprot.writeListEnd(); } @@ -9428,18 +9743,18 @@ public class MasterServer { } - private static class getPublicImages_resultTupleSchemeFactory implements SchemeFactory { + private static class getPublicImages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getPublicImages_resultTupleScheme getScheme() { return new getPublicImages_resultTupleScheme(); } } - private static class getPublicImages_resultTupleScheme extends TupleScheme { + private static class getPublicImages_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getPublicImages_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -9453,9 +9768,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (ImageSummaryRead _iter318 : struct.success) + for (ImageSummaryRead _iter430 : struct.success) { - _iter318.write(oprot); + _iter430.write(oprot); } } } @@ -9469,18 +9784,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPublicImages_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list319 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list319.size); - ImageSummaryRead _elem320; - for (int _i321 = 0; _i321 < _list319.size; ++_i321) + org.apache.thrift.protocol.TList _list431 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list431.size); + @org.apache.thrift.annotation.Nullable ImageSummaryRead _elem432; + for (int _i433 = 0; _i433 < _list431.size; ++_i433) { - _elem320 = new ImageSummaryRead(); - _elem320.read(iprot); - struct.success.add(_elem320); + _elem432 = new ImageSummaryRead(); + _elem432.read(iprot); + struct.success.add(_elem432); } } struct.setSuccessIsSet(true); @@ -9498,6 +9813,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getImageDetails_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -9506,24 +9824,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getImageDetails_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getImageDetails_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageDetails_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageDetails_argsTupleSchemeFactory(); - public String sessionId; // required - public String imageBaseId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // 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 { SESSION_ID((short)1, "sessionId"), IMAGE_BASE_ID((short)2, "imageBaseId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -9531,6 +9846,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SESSION_ID @@ -9548,21 +9864,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -9571,20 +9888,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageDetails_args.class, metaDataMap); } @@ -9592,8 +9909,8 @@ public class MasterServer { } public getImageDetails_args( - String sessionId, - String imageBaseId) + java.lang.String sessionId, + java.lang.String imageBaseId) { this(); this.sessionId = sessionId; @@ -9622,11 +9939,12 @@ public class MasterServer { this.imageBaseId = null; } - public String getSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSessionId() { return this.sessionId; } - public getImageDetails_args setSessionId(String sessionId) { + public getImageDetails_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) { this.sessionId = sessionId; return this; } @@ -9646,11 +9964,12 @@ public class MasterServer { } } - public String getImageBaseId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getImageBaseId() { return this.imageBaseId; } - public getImageDetails_args setImageBaseId(String imageBaseId) { + public getImageDetails_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) { this.imageBaseId = imageBaseId; return this; } @@ -9670,13 +9989,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SESSION_ID: if (value == null) { unsetSessionId(); } else { - setSessionId((String)value); + setSessionId((java.lang.String)value); } break; @@ -9684,14 +10003,15 @@ public class MasterServer { if (value == null) { unsetImageBaseId(); } else { - setImageBaseId((String)value); + setImageBaseId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SESSION_ID: return getSessionId(); @@ -9700,13 +10020,13 @@ public class MasterServer { return getImageBaseId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -9715,13 +10035,11 @@ public class MasterServer { case IMAGE_BASE_ID: return isSetImageBaseId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getImageDetails_args) return this.equals((getImageDetails_args)that); return false; @@ -9730,6 +10048,8 @@ public class MasterServer { public boolean equals(getImageDetails_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_sessionId = true && this.isSetSessionId(); boolean that_present_sessionId = true && that.isSetSessionId(); @@ -9754,19 +10074,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_sessionId = true && (isSetSessionId()); - list.add(present_sessionId); - if (present_sessionId) - list.add(sessionId); + hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287); + if (isSetSessionId()) + hashCode = hashCode * 8191 + sessionId.hashCode(); - boolean present_imageBaseId = true && (isSetImageBaseId()); - list.add(present_imageBaseId); - if (present_imageBaseId) - list.add(imageBaseId); + hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287); + if (isSetImageBaseId()) + hashCode = hashCode * 8191 + imageBaseId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -9777,7 +10095,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -9787,7 +10105,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId()); + lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId()); if (lastComparison != 0) { return lastComparison; } @@ -9800,21 +10118,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getImageDetails_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageDetails_args("); boolean first = true; sb.append("sessionId:"); @@ -9849,7 +10168,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -9857,13 +10176,13 @@ public class MasterServer { } } - private static class getImageDetails_argsStandardSchemeFactory implements SchemeFactory { + private static class getImageDetails_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageDetails_argsStandardScheme getScheme() { return new getImageDetails_argsStandardScheme(); } } - private static class getImageDetails_argsStandardScheme extends StandardScheme { + private static class getImageDetails_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getImageDetails_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -9922,18 +10241,18 @@ public class MasterServer { } - private static class getImageDetails_argsTupleSchemeFactory implements SchemeFactory { + private static class getImageDetails_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageDetails_argsTupleScheme getScheme() { return new getImageDetails_argsTupleScheme(); } } - private static class getImageDetails_argsTupleScheme extends TupleScheme { + private static class getImageDetails_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getImageDetails_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSessionId()) { optionals.set(0); } @@ -9951,8 +10270,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageDetails_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.sessionId = iprot.readString(); struct.setSessionIdIsSet(true); @@ -9964,6 +10283,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getImageDetails_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -9974,16 +10296,13 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getImageDetails_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getImageDetails_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageDetails_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageDetails_resultTupleSchemeFactory(); - public ImageDetailsRead success; // required - public TAuthorizationException authError; // required - public TNotFoundException notFound; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable ImageDetailsRead success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required + public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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 { @@ -9992,10 +10311,10 @@ public class MasterServer { NOT_FOUND((short)2, "notFound"), SERVER_ERROR((short)3, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -10003,6 +10322,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -10024,21 +10344,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -10047,24 +10368,24 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageDetailsRead.class))); tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageDetails_result.class, metaDataMap); } @@ -10114,11 +10435,12 @@ public class MasterServer { this.serverError = null; } + @org.apache.thrift.annotation.Nullable public ImageDetailsRead getSuccess() { return this.success; } - public getImageDetails_result setSuccess(ImageDetailsRead success) { + public getImageDetails_result setSuccess(@org.apache.thrift.annotation.Nullable ImageDetailsRead success) { this.success = success; return this; } @@ -10138,11 +10460,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getAuthError() { return this.authError; } - public getImageDetails_result setAuthError(TAuthorizationException authError) { + public getImageDetails_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) { this.authError = authError; return this; } @@ -10162,11 +10485,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TNotFoundException getNotFound() { return this.notFound; } - public getImageDetails_result setNotFound(TNotFoundException notFound) { + public getImageDetails_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) { this.notFound = notFound; return this; } @@ -10186,11 +10510,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getImageDetails_result setServerError(TInvocationException serverError) { + public getImageDetails_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -10210,7 +10535,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -10247,7 +10572,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -10262,13 +10588,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -10281,13 +10607,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getImageDetails_result) return this.equals((getImageDetails_result)that); return false; @@ -10296,6 +10620,8 @@ public class MasterServer { public boolean equals(getImageDetails_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -10338,29 +10664,25 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_authError = true && (isSetAuthError()); - list.add(present_authError); - if (present_authError) - list.add(authError); + hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287); + if (isSetAuthError()) + hashCode = hashCode * 8191 + authError.hashCode(); - boolean present_notFound = true && (isSetNotFound()); - list.add(present_notFound); - if (present_notFound) - list.add(notFound); + hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287); + if (isSetNotFound()) + hashCode = hashCode * 8191 + notFound.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -10371,7 +10693,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -10381,7 +10703,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError()); + lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError()); if (lastComparison != 0) { return lastComparison; } @@ -10391,7 +10713,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound()); + lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound()); if (lastComparison != 0) { return lastComparison; } @@ -10401,7 +10723,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -10414,21 +10736,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getImageDetails_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageDetails_result("); boolean first = true; sb.append("success:"); @@ -10482,7 +10805,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -10490,13 +10813,13 @@ public class MasterServer { } } - private static class getImageDetails_resultStandardSchemeFactory implements SchemeFactory { + private static class getImageDetails_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageDetails_resultStandardScheme getScheme() { return new getImageDetails_resultStandardScheme(); } } - private static class getImageDetails_resultStandardScheme extends StandardScheme { + private static class getImageDetails_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getImageDetails_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -10585,18 +10908,18 @@ public class MasterServer { } - private static class getImageDetails_resultTupleSchemeFactory implements SchemeFactory { + private static class getImageDetails_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageDetails_resultTupleScheme getScheme() { return new getImageDetails_resultTupleScheme(); } } - private static class getImageDetails_resultTupleScheme extends TupleScheme { + private static class getImageDetails_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getImageDetails_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -10626,8 +10949,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageDetails_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.success = new ImageDetailsRead(); struct.success.read(iprot); @@ -10651,6 +10974,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getUser_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -10659,24 +10985,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", 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 Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getUser_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getUser_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUser_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUser_argsTupleSchemeFactory(); - public String userToken; // required - public String userId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required + public @org.apache.thrift.annotation.Nullable java.lang.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_TOKEN((short)1, "userToken"), USER_ID((short)2, "userId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -10684,6 +11007,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // USER_TOKEN @@ -10701,21 +11025,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -10724,20 +11049,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); 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 , "UUID"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUser_args.class, metaDataMap); } @@ -10745,8 +11070,8 @@ public class MasterServer { } public getUser_args( - String userToken, - String userId) + java.lang.String userToken, + java.lang.String userId) { this(); this.userToken = userToken; @@ -10775,11 +11100,12 @@ public class MasterServer { this.userId = null; } - public String getUserToken() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getUserToken() { return this.userToken; } - public getUser_args setUserToken(String userToken) { + public getUser_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) { this.userToken = userToken; return this; } @@ -10799,11 +11125,12 @@ public class MasterServer { } } - public String getUserId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getUserId() { return this.userId; } - public getUser_args setUserId(String userId) { + public getUser_args setUserId(@org.apache.thrift.annotation.Nullable java.lang.String userId) { this.userId = userId; return this; } @@ -10823,13 +11150,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case USER_TOKEN: if (value == null) { unsetUserToken(); } else { - setUserToken((String)value); + setUserToken((java.lang.String)value); } break; @@ -10837,14 +11164,15 @@ public class MasterServer { if (value == null) { unsetUserId(); } else { - setUserId((String)value); + setUserId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case USER_TOKEN: return getUserToken(); @@ -10853,13 +11181,13 @@ public class MasterServer { return getUserId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -10868,13 +11196,11 @@ public class MasterServer { case USER_ID: return isSetUserId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getUser_args) return this.equals((getUser_args)that); return false; @@ -10883,6 +11209,8 @@ public class MasterServer { public boolean equals(getUser_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_userToken = true && this.isSetUserToken(); boolean that_present_userToken = true && that.isSetUserToken(); @@ -10907,19 +11235,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_userToken = true && (isSetUserToken()); - list.add(present_userToken); - if (present_userToken) - list.add(userToken); + hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287); + if (isSetUserToken()) + hashCode = hashCode * 8191 + userToken.hashCode(); - boolean present_userId = true && (isSetUserId()); - list.add(present_userId); - if (present_userId) - list.add(userId); + hashCode = hashCode * 8191 + ((isSetUserId()) ? 131071 : 524287); + if (isSetUserId()) + hashCode = hashCode * 8191 + userId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -10930,7 +11256,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken()); + lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken()); if (lastComparison != 0) { return lastComparison; } @@ -10940,7 +11266,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId()); + lastComparison = java.lang.Boolean.compare(isSetUserId(), other.isSetUserId()); if (lastComparison != 0) { return lastComparison; } @@ -10953,21 +11279,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getUser_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getUser_args("); boolean first = true; sb.append("userToken:"); @@ -11002,7 +11329,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -11010,13 +11337,13 @@ public class MasterServer { } } - private static class getUser_argsStandardSchemeFactory implements SchemeFactory { + private static class getUser_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUser_argsStandardScheme getScheme() { return new getUser_argsStandardScheme(); } } - private static class getUser_argsStandardScheme extends StandardScheme { + private static class getUser_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getUser_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -11075,18 +11402,18 @@ public class MasterServer { } - private static class getUser_argsTupleSchemeFactory implements SchemeFactory { + private static class getUser_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUser_argsTupleScheme getScheme() { return new getUser_argsTupleScheme(); } } - private static class getUser_argsTupleScheme extends TupleScheme { + private static class getUser_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getUser_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetUserToken()) { optionals.set(0); } @@ -11104,8 +11431,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getUser_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.userToken = iprot.readString(); struct.setUserTokenIsSet(true); @@ -11117,6 +11444,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getUser_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -11127,16 +11457,13 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getUser_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getUser_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUser_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUser_resultTupleSchemeFactory(); - public UserInfo success; // required - public TAuthorizationException authError; // required - public TNotFoundException notFound; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable UserInfo success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required + public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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 { @@ -11145,10 +11472,10 @@ public class MasterServer { NOT_FOUND((short)2, "notFound"), SERVER_ERROR((short)3, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -11156,6 +11483,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -11177,21 +11505,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -11200,24 +11529,24 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class))); tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUser_result.class, metaDataMap); } @@ -11267,11 +11596,12 @@ public class MasterServer { this.serverError = null; } + @org.apache.thrift.annotation.Nullable public UserInfo getSuccess() { return this.success; } - public getUser_result setSuccess(UserInfo success) { + public getUser_result setSuccess(@org.apache.thrift.annotation.Nullable UserInfo success) { this.success = success; return this; } @@ -11291,11 +11621,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getAuthError() { return this.authError; } - public getUser_result setAuthError(TAuthorizationException authError) { + public getUser_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) { this.authError = authError; return this; } @@ -11315,11 +11646,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TNotFoundException getNotFound() { return this.notFound; } - public getUser_result setNotFound(TNotFoundException notFound) { + public getUser_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) { this.notFound = notFound; return this; } @@ -11339,11 +11671,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getUser_result setServerError(TInvocationException serverError) { + public getUser_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -11363,7 +11696,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -11400,7 +11733,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -11415,13 +11749,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -11434,13 +11768,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getUser_result) return this.equals((getUser_result)that); return false; @@ -11449,6 +11781,8 @@ public class MasterServer { public boolean equals(getUser_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -11491,29 +11825,25 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_authError = true && (isSetAuthError()); - list.add(present_authError); - if (present_authError) - list.add(authError); + hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287); + if (isSetAuthError()) + hashCode = hashCode * 8191 + authError.hashCode(); - boolean present_notFound = true && (isSetNotFound()); - list.add(present_notFound); - if (present_notFound) - list.add(notFound); + hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287); + if (isSetNotFound()) + hashCode = hashCode * 8191 + notFound.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -11524,7 +11854,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -11534,7 +11864,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError()); + lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError()); if (lastComparison != 0) { return lastComparison; } @@ -11544,7 +11874,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound()); + lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound()); if (lastComparison != 0) { return lastComparison; } @@ -11554,7 +11884,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -11567,21 +11897,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getUser_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getUser_result("); boolean first = true; sb.append("success:"); @@ -11635,7 +11966,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -11643,13 +11974,13 @@ public class MasterServer { } } - private static class getUser_resultStandardSchemeFactory implements SchemeFactory { + private static class getUser_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUser_resultStandardScheme getScheme() { return new getUser_resultStandardScheme(); } } - private static class getUser_resultStandardScheme extends StandardScheme { + private static class getUser_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getUser_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -11738,18 +12069,18 @@ public class MasterServer { } - private static class getUser_resultTupleSchemeFactory implements SchemeFactory { + private static class getUser_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUser_resultTupleScheme getScheme() { return new getUser_resultTupleScheme(); } } - private static class getUser_resultTupleScheme extends TupleScheme { + private static class getUser_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getUser_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -11779,8 +12110,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getUser_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.success = new UserInfo(); struct.success.read(iprot); @@ -11804,6 +12135,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class invalidateSession_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -11811,22 +12145,19 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new invalidateSession_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new invalidateSession_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateSession_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateSession_argsTupleSchemeFactory(); - public String sessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // 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 { SESSION_ID((short)1, "sessionId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -11834,6 +12165,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SESSION_ID @@ -11849,21 +12181,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -11872,18 +12205,18 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(invalidateSession_args.class, metaDataMap); } @@ -11891,7 +12224,7 @@ public class MasterServer { } public invalidateSession_args( - String sessionId) + java.lang.String sessionId) { this(); this.sessionId = sessionId; @@ -11915,11 +12248,12 @@ public class MasterServer { this.sessionId = null; } - public String getSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSessionId() { return this.sessionId; } - public invalidateSession_args setSessionId(String sessionId) { + public invalidateSession_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) { this.sessionId = sessionId; return this; } @@ -11939,45 +12273,44 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SESSION_ID: if (value == null) { unsetSessionId(); } else { - setSessionId((String)value); + setSessionId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SESSION_ID: return getSessionId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case SESSION_ID: return isSetSessionId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof invalidateSession_args) return this.equals((invalidateSession_args)that); return false; @@ -11986,6 +12319,8 @@ public class MasterServer { public boolean equals(invalidateSession_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_sessionId = true && this.isSetSessionId(); boolean that_present_sessionId = true && that.isSetSessionId(); @@ -12001,14 +12336,13 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_sessionId = true && (isSetSessionId()); - list.add(present_sessionId); - if (present_sessionId) - list.add(sessionId); + hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287); + if (isSetSessionId()) + hashCode = hashCode * 8191 + sessionId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -12019,7 +12353,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -12032,21 +12366,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("invalidateSession_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("invalidateSession_args("); boolean first = true; sb.append("sessionId:"); @@ -12073,7 +12408,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -12081,13 +12416,13 @@ public class MasterServer { } } - private static class invalidateSession_argsStandardSchemeFactory implements SchemeFactory { + private static class invalidateSession_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public invalidateSession_argsStandardScheme getScheme() { return new invalidateSession_argsStandardScheme(); } } - private static class invalidateSession_argsStandardScheme extends StandardScheme { + private static class invalidateSession_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, invalidateSession_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -12133,18 +12468,18 @@ public class MasterServer { } - private static class invalidateSession_argsTupleSchemeFactory implements SchemeFactory { + private static class invalidateSession_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public invalidateSession_argsTupleScheme getScheme() { return new invalidateSession_argsTupleScheme(); } } - private static class invalidateSession_argsTupleScheme extends TupleScheme { + private static class invalidateSession_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, invalidateSession_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSessionId()) { optionals.set(0); } @@ -12156,8 +12491,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, invalidateSession_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.sessionId = iprot.readString(); struct.setSessionIdIsSet(true); @@ -12165,6 +12500,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class invalidateSession_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -12172,22 +12510,19 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField EX_FIELD_DESC = new org.apache.thrift.protocol.TField("ex", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new invalidateSession_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new invalidateSession_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateSession_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateSession_resultTupleSchemeFactory(); - public TInvalidTokenException ex; // required + public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex; // 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 { EX((short)1, "ex"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -12195,6 +12530,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // EX @@ -12210,21 +12546,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -12233,18 +12570,18 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.EX, new org.apache.thrift.meta_data.FieldMetaData("ex", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(invalidateSession_result.class, metaDataMap); } @@ -12276,11 +12613,12 @@ public class MasterServer { this.ex = null; } + @org.apache.thrift.annotation.Nullable public TInvalidTokenException getEx() { return this.ex; } - public invalidateSession_result setEx(TInvalidTokenException ex) { + public invalidateSession_result setEx(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex) { this.ex = ex; return this; } @@ -12300,7 +12638,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case EX: if (value == null) { @@ -12313,32 +12651,31 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case EX: return getEx(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case EX: return isSetEx(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof invalidateSession_result) return this.equals((invalidateSession_result)that); return false; @@ -12347,6 +12684,8 @@ public class MasterServer { public boolean equals(invalidateSession_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_ex = true && this.isSetEx(); boolean that_present_ex = true && that.isSetEx(); @@ -12362,14 +12701,13 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_ex = true && (isSetEx()); - list.add(present_ex); - if (present_ex) - list.add(ex); + hashCode = hashCode * 8191 + ((isSetEx()) ? 131071 : 524287); + if (isSetEx()) + hashCode = hashCode * 8191 + ex.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -12380,7 +12718,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetEx()).compareTo(other.isSetEx()); + lastComparison = java.lang.Boolean.compare(isSetEx(), other.isSetEx()); if (lastComparison != 0) { return lastComparison; } @@ -12393,21 +12731,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("invalidateSession_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("invalidateSession_result("); boolean first = true; sb.append("ex:"); @@ -12434,7 +12773,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -12442,13 +12781,13 @@ public class MasterServer { } } - private static class invalidateSession_resultStandardSchemeFactory implements SchemeFactory { + private static class invalidateSession_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public invalidateSession_resultStandardScheme getScheme() { return new invalidateSession_resultStandardScheme(); } } - private static class invalidateSession_resultStandardScheme extends StandardScheme { + private static class invalidateSession_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, invalidateSession_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -12495,18 +12834,18 @@ public class MasterServer { } - private static class invalidateSession_resultTupleSchemeFactory implements SchemeFactory { + private static class invalidateSession_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public invalidateSession_resultTupleScheme getScheme() { return new invalidateSession_resultTupleScheme(); } } - private static class invalidateSession_resultTupleScheme extends TupleScheme { + private static class invalidateSession_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, invalidateSession_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetEx()) { optionals.set(0); } @@ -12518,8 +12857,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, invalidateSession_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.ex = new TInvalidTokenException(); struct.ex.read(iprot); @@ -12528,6 +12867,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getUserFromToken_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -12535,22 +12877,19 @@ public class MasterServer { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getUserFromToken_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getUserFromToken_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserFromToken_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserFromToken_argsTupleSchemeFactory(); - public String token; // required + public @org.apache.thrift.annotation.Nullable java.lang.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 byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -12558,6 +12897,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // TOKEN @@ -12573,21 +12913,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -12596,18 +12937,18 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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 , "Token"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserFromToken_args.class, metaDataMap); } @@ -12615,7 +12956,7 @@ public class MasterServer { } public getUserFromToken_args( - String token) + java.lang.String token) { this(); this.token = token; @@ -12639,11 +12980,12 @@ public class MasterServer { this.token = null; } - public String getToken() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getToken() { return this.token; } - public getUserFromToken_args setToken(String token) { + public getUserFromToken_args setToken(@org.apache.thrift.annotation.Nullable java.lang.String token) { this.token = token; return this; } @@ -12663,45 +13005,44 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case TOKEN: if (value == null) { unsetToken(); } else { - setToken((String)value); + setToken((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case TOKEN: return getToken(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case TOKEN: return isSetToken(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getUserFromToken_args) return this.equals((getUserFromToken_args)that); return false; @@ -12710,6 +13051,8 @@ public class MasterServer { public boolean equals(getUserFromToken_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_token = true && this.isSetToken(); boolean that_present_token = true && that.isSetToken(); @@ -12725,14 +13068,13 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_token = true && (isSetToken()); - list.add(present_token); - if (present_token) - list.add(token); + hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287); + if (isSetToken()) + hashCode = hashCode * 8191 + token.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -12743,7 +13085,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + lastComparison = java.lang.Boolean.compare(isSetToken(), other.isSetToken()); if (lastComparison != 0) { return lastComparison; } @@ -12756,21 +13098,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getUserFromToken_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserFromToken_args("); boolean first = true; sb.append("token:"); @@ -12797,7 +13140,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -12805,13 +13148,13 @@ public class MasterServer { } } - private static class getUserFromToken_argsStandardSchemeFactory implements SchemeFactory { + private static class getUserFromToken_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUserFromToken_argsStandardScheme getScheme() { return new getUserFromToken_argsStandardScheme(); } } - private static class getUserFromToken_argsStandardScheme extends StandardScheme { + private static class getUserFromToken_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getUserFromToken_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -12857,18 +13200,18 @@ public class MasterServer { } - private static class getUserFromToken_argsTupleSchemeFactory implements SchemeFactory { + private static class getUserFromToken_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUserFromToken_argsTupleScheme getScheme() { return new getUserFromToken_argsTupleScheme(); } } - private static class getUserFromToken_argsTupleScheme extends TupleScheme { + private static class getUserFromToken_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetToken()) { optionals.set(0); } @@ -12880,8 +13223,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.token = iprot.readString(); struct.setTokenIsSet(true); @@ -12889,6 +13232,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getUserFromToken_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -12897,24 +13243,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getUserFromToken_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getUserFromToken_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserFromToken_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserFromToken_resultTupleSchemeFactory(); - public UserInfo success; // required - public TInvalidTokenException failure; // required + public @org.apache.thrift.annotation.Nullable UserInfo success; // required + public @org.apache.thrift.annotation.Nullable TInvalidTokenException failure; // 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"), FAILURE((short)1, "failure"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -12922,6 +13265,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -12939,21 +13283,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -12962,20 +13307,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserFromToken_result.class, metaDataMap); } @@ -13013,11 +13358,12 @@ public class MasterServer { this.failure = null; } + @org.apache.thrift.annotation.Nullable public UserInfo getSuccess() { return this.success; } - public getUserFromToken_result setSuccess(UserInfo success) { + public getUserFromToken_result setSuccess(@org.apache.thrift.annotation.Nullable UserInfo success) { this.success = success; return this; } @@ -13037,11 +13383,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvalidTokenException getFailure() { return this.failure; } - public getUserFromToken_result setFailure(TInvalidTokenException failure) { + public getUserFromToken_result setFailure(@org.apache.thrift.annotation.Nullable TInvalidTokenException failure) { this.failure = failure; return this; } @@ -13061,7 +13408,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -13082,7 +13429,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -13091,13 +13439,13 @@ public class MasterServer { return getFailure(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -13106,13 +13454,11 @@ public class MasterServer { case FAILURE: return isSetFailure(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getUserFromToken_result) return this.equals((getUserFromToken_result)that); return false; @@ -13121,6 +13467,8 @@ public class MasterServer { public boolean equals(getUserFromToken_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -13145,19 +13493,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -13168,7 +13514,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -13178,7 +13524,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -13191,21 +13537,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getUserFromToken_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserFromToken_result("); boolean first = true; sb.append("success:"); @@ -13243,7 +13590,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -13251,13 +13598,13 @@ public class MasterServer { } } - private static class getUserFromToken_resultStandardSchemeFactory implements SchemeFactory { + private static class getUserFromToken_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUserFromToken_resultStandardScheme getScheme() { return new getUserFromToken_resultStandardScheme(); } } - private static class getUserFromToken_resultStandardScheme extends StandardScheme { + private static class getUserFromToken_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getUserFromToken_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -13318,18 +13665,18 @@ public class MasterServer { } - private static class getUserFromToken_resultTupleSchemeFactory implements SchemeFactory { + private static class getUserFromToken_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getUserFromToken_resultTupleScheme getScheme() { return new getUserFromToken_resultTupleScheme(); } } - private static class getUserFromToken_resultTupleScheme extends TupleScheme { + private static class getUserFromToken_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -13347,8 +13694,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.success = new UserInfo(); struct.success.read(iprot); @@ -13362,6 +13709,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class isServerAuthenticated_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -13369,22 +13719,19 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new isServerAuthenticated_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new isServerAuthenticated_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new isServerAuthenticated_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new isServerAuthenticated_argsTupleSchemeFactory(); - public String serverSessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String serverSessionId; // 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 { SERVER_SESSION_ID((short)1, "serverSessionId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -13392,6 +13739,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SERVER_SESSION_ID @@ -13407,21 +13755,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -13430,18 +13779,18 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isServerAuthenticated_args.class, metaDataMap); } @@ -13449,7 +13798,7 @@ public class MasterServer { } public isServerAuthenticated_args( - String serverSessionId) + java.lang.String serverSessionId) { this(); this.serverSessionId = serverSessionId; @@ -13473,11 +13822,12 @@ public class MasterServer { this.serverSessionId = null; } - public String getServerSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getServerSessionId() { return this.serverSessionId; } - public isServerAuthenticated_args setServerSessionId(String serverSessionId) { + public isServerAuthenticated_args setServerSessionId(@org.apache.thrift.annotation.Nullable java.lang.String serverSessionId) { this.serverSessionId = serverSessionId; return this; } @@ -13497,45 +13847,44 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SERVER_SESSION_ID: if (value == null) { unsetServerSessionId(); } else { - setServerSessionId((String)value); + setServerSessionId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SERVER_SESSION_ID: return getServerSessionId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case SERVER_SESSION_ID: return isSetServerSessionId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof isServerAuthenticated_args) return this.equals((isServerAuthenticated_args)that); return false; @@ -13544,6 +13893,8 @@ public class MasterServer { public boolean equals(isServerAuthenticated_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_serverSessionId = true && this.isSetServerSessionId(); boolean that_present_serverSessionId = true && that.isSetServerSessionId(); @@ -13559,14 +13910,13 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_serverSessionId = true && (isSetServerSessionId()); - list.add(present_serverSessionId); - if (present_serverSessionId) - list.add(serverSessionId); + hashCode = hashCode * 8191 + ((isSetServerSessionId()) ? 131071 : 524287); + if (isSetServerSessionId()) + hashCode = hashCode * 8191 + serverSessionId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -13577,7 +13927,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); + lastComparison = java.lang.Boolean.compare(isSetServerSessionId(), other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -13590,21 +13940,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("isServerAuthenticated_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("isServerAuthenticated_args("); boolean first = true; sb.append("serverSessionId:"); @@ -13631,7 +13982,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -13639,13 +13990,13 @@ public class MasterServer { } } - private static class isServerAuthenticated_argsStandardSchemeFactory implements SchemeFactory { + private static class isServerAuthenticated_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public isServerAuthenticated_argsStandardScheme getScheme() { return new isServerAuthenticated_argsStandardScheme(); } } - private static class isServerAuthenticated_argsStandardScheme extends StandardScheme { + private static class isServerAuthenticated_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, isServerAuthenticated_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -13691,18 +14042,18 @@ public class MasterServer { } - private static class isServerAuthenticated_argsTupleSchemeFactory implements SchemeFactory { + private static class isServerAuthenticated_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public isServerAuthenticated_argsTupleScheme getScheme() { return new isServerAuthenticated_argsTupleScheme(); } } - private static class isServerAuthenticated_argsTupleScheme extends TupleScheme { + private static class isServerAuthenticated_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetServerSessionId()) { optionals.set(0); } @@ -13714,8 +14065,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.serverSessionId = iprot.readString(); struct.setServerSessionIdIsSet(true); @@ -13723,6 +14074,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class isServerAuthenticated_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -13730,11 +14084,8 @@ public class MasterServer { 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, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new isServerAuthenticated_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new isServerAuthenticated_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new isServerAuthenticated_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new isServerAuthenticated_resultTupleSchemeFactory(); public boolean success; // required @@ -13742,10 +14093,10 @@ public class MasterServer { public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -13753,6 +14104,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -13768,21 +14120,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -13791,7 +14144,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -13799,12 +14152,12 @@ public class MasterServer { // 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; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isServerAuthenticated_result.class, metaDataMap); } @@ -13848,57 +14201,56 @@ public class MasterServer { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.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); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((Boolean)value); + setSuccess((java.lang.Boolean)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return isSuccess(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case SUCCESS: return isSetSuccess(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof isServerAuthenticated_result) return this.equals((isServerAuthenticated_result)that); return false; @@ -13907,6 +14259,8 @@ public class MasterServer { public boolean equals(isServerAuthenticated_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true; boolean that_present_success = true; @@ -13922,14 +14276,11 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true; - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((success) ? 131071 : 524287); - return list.hashCode(); + return hashCode; } @Override @@ -13940,7 +14291,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -13953,21 +14304,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("isServerAuthenticated_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("isServerAuthenticated_result("); boolean first = true; sb.append("success:"); @@ -13990,7 +14342,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -14000,13 +14352,13 @@ public class MasterServer { } } - private static class isServerAuthenticated_resultStandardSchemeFactory implements SchemeFactory { + private static class isServerAuthenticated_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public isServerAuthenticated_resultStandardScheme getScheme() { return new isServerAuthenticated_resultStandardScheme(); } } - private static class isServerAuthenticated_resultStandardScheme extends StandardScheme { + private static class isServerAuthenticated_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, isServerAuthenticated_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -14052,18 +14404,18 @@ public class MasterServer { } - private static class isServerAuthenticated_resultTupleSchemeFactory implements SchemeFactory { + private static class isServerAuthenticated_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public isServerAuthenticated_resultTupleScheme getScheme() { return new isServerAuthenticated_resultTupleScheme(); } } - private static class isServerAuthenticated_resultTupleScheme extends TupleScheme { + private static class isServerAuthenticated_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -14075,8 +14427,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.success = iprot.readBool(); struct.setSuccessIsSet(true); @@ -14084,6 +14436,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class startServerAuthentication_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -14091,11 +14446,8 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SATELLITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("satelliteId", org.apache.thrift.protocol.TType.I32, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new startServerAuthentication_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new startServerAuthentication_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new startServerAuthentication_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new startServerAuthentication_argsTupleSchemeFactory(); public int satelliteId; // required @@ -14103,10 +14455,10 @@ public class MasterServer { public enum _Fields implements org.apache.thrift.TFieldIdEnum { SATELLITE_ID((short)1, "satelliteId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -14114,6 +14466,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SATELLITE_ID @@ -14129,21 +14482,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -14152,7 +14506,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -14160,12 +14514,12 @@ public class MasterServer { // isset id assignments private static final int __SATELLITEID_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SATELLITE_ID, new org.apache.thrift.meta_data.FieldMetaData("satelliteId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startServerAuthentication_args.class, metaDataMap); } @@ -14209,57 +14563,56 @@ public class MasterServer { } public void unsetSatelliteId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID); } /** Returns true if field satelliteId is set (has been assigned a value) and false otherwise */ public boolean isSetSatelliteId() { - return EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID); } public void setSatelliteIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SATELLITE_ID: if (value == null) { unsetSatelliteId(); } else { - setSatelliteId((Integer)value); + setSatelliteId((java.lang.Integer)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SATELLITE_ID: return getSatelliteId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case SATELLITE_ID: return isSetSatelliteId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof startServerAuthentication_args) return this.equals((startServerAuthentication_args)that); return false; @@ -14268,6 +14621,8 @@ public class MasterServer { public boolean equals(startServerAuthentication_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_satelliteId = true; boolean that_present_satelliteId = true; @@ -14283,14 +14638,11 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_satelliteId = true; - list.add(present_satelliteId); - if (present_satelliteId) - list.add(satelliteId); + hashCode = hashCode * 8191 + satelliteId; - return list.hashCode(); + return hashCode; } @Override @@ -14301,7 +14653,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSatelliteId()).compareTo(other.isSetSatelliteId()); + lastComparison = java.lang.Boolean.compare(isSetSatelliteId(), other.isSetSatelliteId()); if (lastComparison != 0) { return lastComparison; } @@ -14314,21 +14666,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("startServerAuthentication_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("startServerAuthentication_args("); boolean first = true; sb.append("satelliteId:"); @@ -14351,7 +14704,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -14361,13 +14714,13 @@ public class MasterServer { } } - private static class startServerAuthentication_argsStandardSchemeFactory implements SchemeFactory { + private static class startServerAuthentication_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public startServerAuthentication_argsStandardScheme getScheme() { return new startServerAuthentication_argsStandardScheme(); } } - private static class startServerAuthentication_argsStandardScheme extends StandardScheme { + private static class startServerAuthentication_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, startServerAuthentication_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -14411,18 +14764,18 @@ public class MasterServer { } - private static class startServerAuthentication_argsTupleSchemeFactory implements SchemeFactory { + private static class startServerAuthentication_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public startServerAuthentication_argsTupleScheme getScheme() { return new startServerAuthentication_argsTupleScheme(); } } - private static class startServerAuthentication_argsTupleScheme extends TupleScheme { + private static class startServerAuthentication_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSatelliteId()) { optionals.set(0); } @@ -14434,8 +14787,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.satelliteId = iprot.readI32(); struct.setSatelliteIdIsSet(true); @@ -14443,6 +14796,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class startServerAuthentication_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -14452,15 +14808,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new startServerAuthentication_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new startServerAuthentication_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new startServerAuthentication_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new startServerAuthentication_resultTupleSchemeFactory(); - public ByteBuffer success; // required - public TAuthorizationException failure; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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 { @@ -14468,10 +14821,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERROR((short)2, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -14479,6 +14832,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -14498,21 +14852,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -14521,22 +14876,22 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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 , true))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startServerAuthentication_result.class, metaDataMap); } @@ -14544,7 +14899,7 @@ public class MasterServer { } public startServerAuthentication_result( - ByteBuffer success, + java.nio.ByteBuffer success, TAuthorizationException failure, TInvocationException error) { @@ -14585,16 +14940,16 @@ public class MasterServer { return success == null ? null : success.array(); } - public ByteBuffer bufferForSuccess() { + public java.nio.ByteBuffer bufferForSuccess() { return org.apache.thrift.TBaseHelper.copyBinary(success); } public startServerAuthentication_result setSuccess(byte[] success) { - this.success = success == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(success, success.length)); + this.success = success == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(success.clone()); return this; } - public startServerAuthentication_result setSuccess(ByteBuffer success) { + public startServerAuthentication_result setSuccess(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer success) { this.success = org.apache.thrift.TBaseHelper.copyBinary(success); return this; } @@ -14614,11 +14969,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public startServerAuthentication_result setFailure(TAuthorizationException failure) { + public startServerAuthentication_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -14638,11 +14994,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public startServerAuthentication_result setError(TInvocationException error) { + public startServerAuthentication_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -14662,13 +15019,17 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((ByteBuffer)value); + if (value instanceof byte[]) { + setSuccess((byte[])value); + } else { + setSuccess((java.nio.ByteBuffer)value); + } } break; @@ -14691,7 +15052,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -14703,13 +15065,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -14720,13 +15082,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof startServerAuthentication_result) return this.equals((startServerAuthentication_result)that); return false; @@ -14735,6 +15095,8 @@ public class MasterServer { public boolean equals(startServerAuthentication_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -14768,24 +15130,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -14796,7 +15155,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -14806,7 +15165,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -14816,7 +15175,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -14829,21 +15188,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("startServerAuthentication_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("startServerAuthentication_result("); boolean first = true; sb.append("success:"); @@ -14886,7 +15246,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -14894,13 +15254,13 @@ public class MasterServer { } } - private static class startServerAuthentication_resultStandardSchemeFactory implements SchemeFactory { + private static class startServerAuthentication_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public startServerAuthentication_resultStandardScheme getScheme() { return new startServerAuthentication_resultStandardScheme(); } } - private static class startServerAuthentication_resultStandardScheme extends StandardScheme { + private static class startServerAuthentication_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, startServerAuthentication_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -14974,18 +15334,18 @@ public class MasterServer { } - private static class startServerAuthentication_resultTupleSchemeFactory implements SchemeFactory { + private static class startServerAuthentication_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public startServerAuthentication_resultTupleScheme getScheme() { return new startServerAuthentication_resultTupleScheme(); } } - private static class startServerAuthentication_resultTupleScheme extends TupleScheme { + private static class startServerAuthentication_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -15009,8 +15369,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.success = iprot.readBinary(); struct.setSuccessIsSet(true); @@ -15028,6 +15388,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class serverAuthenticate_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -15036,24 +15399,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SATELLITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("satelliteId", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField CHALLENGE_RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("challengeResponse", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new serverAuthenticate_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new serverAuthenticate_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new serverAuthenticate_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new serverAuthenticate_argsTupleSchemeFactory(); public int satelliteId; // required - public ByteBuffer challengeResponse; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer challengeResponse; // 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 { SATELLITE_ID((short)1, "satelliteId"), CHALLENGE_RESPONSE((short)2, "challengeResponse"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -15061,6 +15421,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SATELLITE_ID @@ -15078,21 +15439,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -15101,7 +15463,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -15109,14 +15471,14 @@ public class MasterServer { // isset id assignments private static final int __SATELLITEID_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SATELLITE_ID, new org.apache.thrift.meta_data.FieldMetaData("satelliteId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.CHALLENGE_RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("challengeResponse", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(serverAuthenticate_args.class, metaDataMap); } @@ -15125,7 +15487,7 @@ public class MasterServer { public serverAuthenticate_args( int satelliteId, - ByteBuffer challengeResponse) + java.nio.ByteBuffer challengeResponse) { this(); this.satelliteId = satelliteId; @@ -15166,16 +15528,16 @@ public class MasterServer { } public void unsetSatelliteId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID); } /** Returns true if field satelliteId is set (has been assigned a value) and false otherwise */ public boolean isSetSatelliteId() { - return EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID); } public void setSatelliteIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value); } public byte[] getChallengeResponse() { @@ -15183,16 +15545,16 @@ public class MasterServer { return challengeResponse == null ? null : challengeResponse.array(); } - public ByteBuffer bufferForChallengeResponse() { + public java.nio.ByteBuffer bufferForChallengeResponse() { return org.apache.thrift.TBaseHelper.copyBinary(challengeResponse); } public serverAuthenticate_args setChallengeResponse(byte[] challengeResponse) { - this.challengeResponse = challengeResponse == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(challengeResponse, challengeResponse.length)); + this.challengeResponse = challengeResponse == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(challengeResponse.clone()); return this; } - public serverAuthenticate_args setChallengeResponse(ByteBuffer challengeResponse) { + public serverAuthenticate_args setChallengeResponse(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer challengeResponse) { this.challengeResponse = org.apache.thrift.TBaseHelper.copyBinary(challengeResponse); return this; } @@ -15212,13 +15574,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SATELLITE_ID: if (value == null) { unsetSatelliteId(); } else { - setSatelliteId((Integer)value); + setSatelliteId((java.lang.Integer)value); } break; @@ -15226,14 +15588,19 @@ public class MasterServer { if (value == null) { unsetChallengeResponse(); } else { - setChallengeResponse((ByteBuffer)value); + if (value instanceof byte[]) { + setChallengeResponse((byte[])value); + } else { + setChallengeResponse((java.nio.ByteBuffer)value); + } } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SATELLITE_ID: return getSatelliteId(); @@ -15242,13 +15609,13 @@ public class MasterServer { return getChallengeResponse(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -15257,13 +15624,11 @@ public class MasterServer { case CHALLENGE_RESPONSE: return isSetChallengeResponse(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof serverAuthenticate_args) return this.equals((serverAuthenticate_args)that); return false; @@ -15272,6 +15637,8 @@ public class MasterServer { public boolean equals(serverAuthenticate_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_satelliteId = true; boolean that_present_satelliteId = true; @@ -15296,19 +15663,15 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_satelliteId = true; - list.add(present_satelliteId); - if (present_satelliteId) - list.add(satelliteId); + hashCode = hashCode * 8191 + satelliteId; - boolean present_challengeResponse = true && (isSetChallengeResponse()); - list.add(present_challengeResponse); - if (present_challengeResponse) - list.add(challengeResponse); + hashCode = hashCode * 8191 + ((isSetChallengeResponse()) ? 131071 : 524287); + if (isSetChallengeResponse()) + hashCode = hashCode * 8191 + challengeResponse.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -15319,7 +15682,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSatelliteId()).compareTo(other.isSetSatelliteId()); + lastComparison = java.lang.Boolean.compare(isSetSatelliteId(), other.isSetSatelliteId()); if (lastComparison != 0) { return lastComparison; } @@ -15329,7 +15692,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(other.isSetChallengeResponse()); + lastComparison = java.lang.Boolean.compare(isSetChallengeResponse(), other.isSetChallengeResponse()); if (lastComparison != 0) { return lastComparison; } @@ -15342,21 +15705,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("serverAuthenticate_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("serverAuthenticate_args("); boolean first = true; sb.append("satelliteId:"); @@ -15387,7 +15751,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -15397,13 +15761,13 @@ public class MasterServer { } } - private static class serverAuthenticate_argsStandardSchemeFactory implements SchemeFactory { + private static class serverAuthenticate_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public serverAuthenticate_argsStandardScheme getScheme() { return new serverAuthenticate_argsStandardScheme(); } } - private static class serverAuthenticate_argsStandardScheme extends StandardScheme { + private static class serverAuthenticate_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, serverAuthenticate_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -15460,18 +15824,18 @@ public class MasterServer { } - private static class serverAuthenticate_argsTupleSchemeFactory implements SchemeFactory { + private static class serverAuthenticate_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public serverAuthenticate_argsTupleScheme getScheme() { return new serverAuthenticate_argsTupleScheme(); } } - private static class serverAuthenticate_argsTupleScheme extends TupleScheme { + private static class serverAuthenticate_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSatelliteId()) { optionals.set(0); } @@ -15489,8 +15853,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.satelliteId = iprot.readI32(); struct.setSatelliteIdIsSet(true); @@ -15502,6 +15866,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class serverAuthenticate_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -15511,15 +15878,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERRR_FIELD_DESC = new org.apache.thrift.protocol.TField("errr", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new serverAuthenticate_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new serverAuthenticate_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new serverAuthenticate_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new serverAuthenticate_resultTupleSchemeFactory(); - public ServerSessionData success; // required - public TAuthorizationException failure; // required - public TInvocationException errr; // required + public @org.apache.thrift.annotation.Nullable ServerSessionData success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException errr; // 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 { @@ -15527,10 +15891,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERRR((short)2, "errr"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -15538,6 +15902,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -15557,21 +15922,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -15580,22 +15946,22 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ServerSessionData.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERRR, new org.apache.thrift.meta_data.FieldMetaData("errr", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(serverAuthenticate_result.class, metaDataMap); } @@ -15639,11 +16005,12 @@ public class MasterServer { this.errr = null; } + @org.apache.thrift.annotation.Nullable public ServerSessionData getSuccess() { return this.success; } - public serverAuthenticate_result setSuccess(ServerSessionData success) { + public serverAuthenticate_result setSuccess(@org.apache.thrift.annotation.Nullable ServerSessionData success) { this.success = success; return this; } @@ -15663,11 +16030,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public serverAuthenticate_result setFailure(TAuthorizationException failure) { + public serverAuthenticate_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -15687,11 +16055,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getErrr() { return this.errr; } - public serverAuthenticate_result setErrr(TInvocationException errr) { + public serverAuthenticate_result setErrr(@org.apache.thrift.annotation.Nullable TInvocationException errr) { this.errr = errr; return this; } @@ -15711,7 +16080,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -15740,7 +16109,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -15752,13 +16122,13 @@ public class MasterServer { return getErrr(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -15769,13 +16139,11 @@ public class MasterServer { case ERRR: return isSetErrr(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof serverAuthenticate_result) return this.equals((serverAuthenticate_result)that); return false; @@ -15784,6 +16152,8 @@ public class MasterServer { public boolean equals(serverAuthenticate_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -15817,24 +16187,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_errr = true && (isSetErrr()); - list.add(present_errr); - if (present_errr) - list.add(errr); + hashCode = hashCode * 8191 + ((isSetErrr()) ? 131071 : 524287); + if (isSetErrr()) + hashCode = hashCode * 8191 + errr.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -15845,7 +16212,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -15855,7 +16222,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -15865,7 +16232,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetErrr()).compareTo(other.isSetErrr()); + lastComparison = java.lang.Boolean.compare(isSetErrr(), other.isSetErrr()); if (lastComparison != 0) { return lastComparison; } @@ -15878,21 +16245,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("serverAuthenticate_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("serverAuthenticate_result("); boolean first = true; sb.append("success:"); @@ -15938,7 +16306,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -15946,13 +16314,13 @@ public class MasterServer { } } - private static class serverAuthenticate_resultStandardSchemeFactory implements SchemeFactory { + private static class serverAuthenticate_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public serverAuthenticate_resultStandardScheme getScheme() { return new serverAuthenticate_resultStandardScheme(); } } - private static class serverAuthenticate_resultStandardScheme extends StandardScheme { + private static class serverAuthenticate_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, serverAuthenticate_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -16027,18 +16395,18 @@ public class MasterServer { } - private static class serverAuthenticate_resultTupleSchemeFactory implements SchemeFactory { + private static class serverAuthenticate_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public serverAuthenticate_resultTupleScheme getScheme() { return new serverAuthenticate_resultTupleScheme(); } } - private static class serverAuthenticate_resultTupleScheme extends TupleScheme { + private static class serverAuthenticate_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -16062,8 +16430,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.success = new ServerSessionData(); struct.success.read(iprot); @@ -16082,6 +16450,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getImageData_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -16090,24 +16461,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getImageData_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getImageData_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageData_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageData_argsTupleSchemeFactory(); - public String serverSessionId; // required - public String imageVersionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String serverSessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // 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 { SERVER_SESSION_ID((short)1, "serverSessionId"), IMAGE_VERSION_ID((short)2, "imageVersionId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -16115,6 +16483,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SERVER_SESSION_ID @@ -16132,21 +16501,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -16155,20 +16525,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_args.class, metaDataMap); } @@ -16176,8 +16546,8 @@ public class MasterServer { } public getImageData_args( - String serverSessionId, - String imageVersionId) + java.lang.String serverSessionId, + java.lang.String imageVersionId) { this(); this.serverSessionId = serverSessionId; @@ -16206,11 +16576,12 @@ public class MasterServer { this.imageVersionId = null; } - public String getServerSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getServerSessionId() { return this.serverSessionId; } - public getImageData_args setServerSessionId(String serverSessionId) { + public getImageData_args setServerSessionId(@org.apache.thrift.annotation.Nullable java.lang.String serverSessionId) { this.serverSessionId = serverSessionId; return this; } @@ -16230,11 +16601,12 @@ public class MasterServer { } } - public String getImageVersionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getImageVersionId() { return this.imageVersionId; } - public getImageData_args setImageVersionId(String imageVersionId) { + public getImageData_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) { this.imageVersionId = imageVersionId; return this; } @@ -16254,13 +16626,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SERVER_SESSION_ID: if (value == null) { unsetServerSessionId(); } else { - setServerSessionId((String)value); + setServerSessionId((java.lang.String)value); } break; @@ -16268,14 +16640,15 @@ public class MasterServer { if (value == null) { unsetImageVersionId(); } else { - setImageVersionId((String)value); + setImageVersionId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SERVER_SESSION_ID: return getServerSessionId(); @@ -16284,13 +16657,13 @@ public class MasterServer { return getImageVersionId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -16299,13 +16672,11 @@ public class MasterServer { case IMAGE_VERSION_ID: return isSetImageVersionId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getImageData_args) return this.equals((getImageData_args)that); return false; @@ -16314,6 +16685,8 @@ public class MasterServer { public boolean equals(getImageData_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_serverSessionId = true && this.isSetServerSessionId(); boolean that_present_serverSessionId = true && that.isSetServerSessionId(); @@ -16338,19 +16711,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_serverSessionId = true && (isSetServerSessionId()); - list.add(present_serverSessionId); - if (present_serverSessionId) - list.add(serverSessionId); + hashCode = hashCode * 8191 + ((isSetServerSessionId()) ? 131071 : 524287); + if (isSetServerSessionId()) + hashCode = hashCode * 8191 + serverSessionId.hashCode(); - boolean present_imageVersionId = true && (isSetImageVersionId()); - list.add(present_imageVersionId); - if (present_imageVersionId) - list.add(imageVersionId); + hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287); + if (isSetImageVersionId()) + hashCode = hashCode * 8191 + imageVersionId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -16361,7 +16732,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); + lastComparison = java.lang.Boolean.compare(isSetServerSessionId(), other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -16371,7 +16742,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId()); + lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId()); if (lastComparison != 0) { return lastComparison; } @@ -16384,21 +16755,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getImageData_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageData_args("); boolean first = true; sb.append("serverSessionId:"); @@ -16433,7 +16805,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -16441,13 +16813,13 @@ public class MasterServer { } } - private static class getImageData_argsStandardSchemeFactory implements SchemeFactory { + private static class getImageData_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageData_argsStandardScheme getScheme() { return new getImageData_argsStandardScheme(); } } - private static class getImageData_argsStandardScheme extends StandardScheme { + private static class getImageData_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getImageData_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -16506,18 +16878,18 @@ public class MasterServer { } - private static class getImageData_argsTupleSchemeFactory implements SchemeFactory { + private static class getImageData_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageData_argsTupleScheme getScheme() { return new getImageData_argsTupleScheme(); } } - private static class getImageData_argsTupleScheme extends TupleScheme { + private static class getImageData_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getImageData_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetServerSessionId()) { optionals.set(0); } @@ -16535,8 +16907,8 @@ public class MasterServer { @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); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.serverSessionId = iprot.readString(); struct.setServerSessionIdIsSet(true); @@ -16548,6 +16920,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getImageData_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -16558,16 +16933,13 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField F3_FIELD_DESC = new org.apache.thrift.protocol.TField("f3", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getImageData_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getImageData_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageData_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageData_resultTupleSchemeFactory(); - public ImagePublishData success; // required - public TAuthorizationException failure; // required - public TInvocationException failure2; // required - public TNotFoundException f3; // required + public @org.apache.thrift.annotation.Nullable ImagePublishData success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException failure2; // required + public @org.apache.thrift.annotation.Nullable TNotFoundException f3; // 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 { @@ -16576,10 +16948,10 @@ public class MasterServer { FAILURE2((short)2, "failure2"), F3((short)3, "f3"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -16587,6 +16959,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -16608,21 +16981,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -16631,24 +17005,24 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePublishData.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_result.class, metaDataMap); } @@ -16698,11 +17072,12 @@ public class MasterServer { this.f3 = null; } + @org.apache.thrift.annotation.Nullable public ImagePublishData getSuccess() { return this.success; } - public getImageData_result setSuccess(ImagePublishData success) { + public getImageData_result setSuccess(@org.apache.thrift.annotation.Nullable ImagePublishData success) { this.success = success; return this; } @@ -16722,11 +17097,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public getImageData_result setFailure(TAuthorizationException failure) { + public getImageData_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -16746,11 +17122,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getFailure2() { return this.failure2; } - public getImageData_result setFailure2(TInvocationException failure2) { + public getImageData_result setFailure2(@org.apache.thrift.annotation.Nullable TInvocationException failure2) { this.failure2 = failure2; return this; } @@ -16770,11 +17147,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TNotFoundException getF3() { return this.f3; } - public getImageData_result setF3(TNotFoundException f3) { + public getImageData_result setF3(@org.apache.thrift.annotation.Nullable TNotFoundException f3) { this.f3 = f3; return this; } @@ -16794,7 +17172,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -16831,7 +17209,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -16846,13 +17225,13 @@ public class MasterServer { return getF3(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -16865,13 +17244,11 @@ public class MasterServer { case F3: return isSetF3(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getImageData_result) return this.equals((getImageData_result)that); return false; @@ -16880,6 +17257,8 @@ public class MasterServer { public boolean equals(getImageData_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -16922,29 +17301,25 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_failure2 = true && (isSetFailure2()); - list.add(present_failure2); - if (present_failure2) - list.add(failure2); + hashCode = hashCode * 8191 + ((isSetFailure2()) ? 131071 : 524287); + if (isSetFailure2()) + hashCode = hashCode * 8191 + failure2.hashCode(); - boolean present_f3 = true && (isSetF3()); - list.add(present_f3); - if (present_f3) - list.add(f3); + hashCode = hashCode * 8191 + ((isSetF3()) ? 131071 : 524287); + if (isSetF3()) + hashCode = hashCode * 8191 + f3.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -16955,7 +17330,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -16965,7 +17340,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -16975,7 +17350,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2()); + lastComparison = java.lang.Boolean.compare(isSetFailure2(), other.isSetFailure2()); if (lastComparison != 0) { return lastComparison; } @@ -16985,7 +17360,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetF3()).compareTo(other.isSetF3()); + lastComparison = java.lang.Boolean.compare(isSetF3(), other.isSetF3()); if (lastComparison != 0) { return lastComparison; } @@ -16998,21 +17373,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getImageData_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageData_result("); boolean first = true; sb.append("success:"); @@ -17066,7 +17442,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -17074,13 +17450,13 @@ public class MasterServer { } } - private static class getImageData_resultStandardSchemeFactory implements SchemeFactory { + private static class getImageData_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageData_resultStandardScheme getScheme() { return new getImageData_resultStandardScheme(); } } - private static class getImageData_resultStandardScheme extends StandardScheme { + private static class getImageData_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getImageData_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -17169,18 +17545,18 @@ public class MasterServer { } - private static class getImageData_resultTupleSchemeFactory implements SchemeFactory { + private static class getImageData_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getImageData_resultTupleScheme getScheme() { return new getImageData_resultTupleScheme(); } } - private static class getImageData_resultTupleScheme extends TupleScheme { + private static class getImageData_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getImageData_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -17210,8 +17586,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getImageData_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.success = new ImagePublishData(); struct.success.read(iprot); @@ -17235,6 +17611,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class submitImage_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -17244,15 +17623,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField IMAGE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageDescription", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new submitImage_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new submitImage_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new submitImage_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new submitImage_argsTupleSchemeFactory(); - public String userToken; // required - public ImagePublishData imageDescription; // required - public List blockHashes; // required + public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required + public @org.apache.thrift.annotation.Nullable ImagePublishData imageDescription; // required + public @org.apache.thrift.annotation.Nullable java.util.List blockHashes; // 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 { @@ -17260,10 +17636,10 @@ public class MasterServer { IMAGE_DESCRIPTION((short)2, "imageDescription"), BLOCK_HASHES((short)3, "blockHashes"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -17271,6 +17647,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // USER_TOKEN @@ -17290,21 +17667,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -17313,15 +17691,15 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.IMAGE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("imageDescription", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -17329,7 +17707,7 @@ public class MasterServer { tmpMap.put(_Fields.BLOCK_HASHES, new org.apache.thrift.meta_data.FieldMetaData("blockHashes", 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 , true)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_args.class, metaDataMap); } @@ -17337,9 +17715,9 @@ public class MasterServer { } public submitImage_args( - String userToken, + java.lang.String userToken, ImagePublishData imageDescription, - List blockHashes) + java.util.List blockHashes) { this(); this.userToken = userToken; @@ -17358,7 +17736,7 @@ public class MasterServer { this.imageDescription = new ImagePublishData(other.imageDescription); } if (other.isSetBlockHashes()) { - List __this__blockHashes = new ArrayList(other.blockHashes); + java.util.List __this__blockHashes = new java.util.ArrayList(other.blockHashes); this.blockHashes = __this__blockHashes; } } @@ -17374,11 +17752,12 @@ public class MasterServer { this.blockHashes = null; } - public String getUserToken() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getUserToken() { return this.userToken; } - public submitImage_args setUserToken(String userToken) { + public submitImage_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) { this.userToken = userToken; return this; } @@ -17398,11 +17777,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public ImagePublishData getImageDescription() { return this.imageDescription; } - public submitImage_args setImageDescription(ImagePublishData imageDescription) { + public submitImage_args setImageDescription(@org.apache.thrift.annotation.Nullable ImagePublishData imageDescription) { this.imageDescription = imageDescription; return this; } @@ -17426,22 +17806,24 @@ public class MasterServer { return (this.blockHashes == null) ? 0 : this.blockHashes.size(); } - public java.util.Iterator getBlockHashesIterator() { + @org.apache.thrift.annotation.Nullable + public java.util.Iterator getBlockHashesIterator() { return (this.blockHashes == null) ? null : this.blockHashes.iterator(); } - public void addToBlockHashes(ByteBuffer elem) { + public void addToBlockHashes(java.nio.ByteBuffer elem) { if (this.blockHashes == null) { - this.blockHashes = new ArrayList(); + this.blockHashes = new java.util.ArrayList(); } this.blockHashes.add(elem); } - public List getBlockHashes() { + @org.apache.thrift.annotation.Nullable + public java.util.List getBlockHashes() { return this.blockHashes; } - public submitImage_args setBlockHashes(List blockHashes) { + public submitImage_args setBlockHashes(@org.apache.thrift.annotation.Nullable java.util.List blockHashes) { this.blockHashes = blockHashes; return this; } @@ -17461,13 +17843,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case USER_TOKEN: if (value == null) { unsetUserToken(); } else { - setUserToken((String)value); + setUserToken((java.lang.String)value); } break; @@ -17483,14 +17865,15 @@ public class MasterServer { if (value == null) { unsetBlockHashes(); } else { - setBlockHashes((List)value); + setBlockHashes((java.util.List)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case USER_TOKEN: return getUserToken(); @@ -17502,13 +17885,13 @@ public class MasterServer { return getBlockHashes(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -17519,13 +17902,11 @@ public class MasterServer { case BLOCK_HASHES: return isSetBlockHashes(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof submitImage_args) return this.equals((submitImage_args)that); return false; @@ -17534,6 +17915,8 @@ public class MasterServer { public boolean equals(submitImage_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_userToken = true && this.isSetUserToken(); boolean that_present_userToken = true && that.isSetUserToken(); @@ -17567,24 +17950,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_userToken = true && (isSetUserToken()); - list.add(present_userToken); - if (present_userToken) - list.add(userToken); + hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287); + if (isSetUserToken()) + hashCode = hashCode * 8191 + userToken.hashCode(); - boolean present_imageDescription = true && (isSetImageDescription()); - list.add(present_imageDescription); - if (present_imageDescription) - list.add(imageDescription); + hashCode = hashCode * 8191 + ((isSetImageDescription()) ? 131071 : 524287); + if (isSetImageDescription()) + hashCode = hashCode * 8191 + imageDescription.hashCode(); - boolean present_blockHashes = true && (isSetBlockHashes()); - list.add(present_blockHashes); - if (present_blockHashes) - list.add(blockHashes); + hashCode = hashCode * 8191 + ((isSetBlockHashes()) ? 131071 : 524287); + if (isSetBlockHashes()) + hashCode = hashCode * 8191 + blockHashes.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -17595,7 +17975,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken()); + lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken()); if (lastComparison != 0) { return lastComparison; } @@ -17605,7 +17985,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription()); + lastComparison = java.lang.Boolean.compare(isSetImageDescription(), other.isSetImageDescription()); if (lastComparison != 0) { return lastComparison; } @@ -17615,7 +17995,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes()); + lastComparison = java.lang.Boolean.compare(isSetBlockHashes(), other.isSetBlockHashes()); if (lastComparison != 0) { return lastComparison; } @@ -17628,21 +18008,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("submitImage_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("submitImage_args("); boolean first = true; sb.append("userToken:"); @@ -17688,7 +18069,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -17696,13 +18077,13 @@ public class MasterServer { } } - private static class submitImage_argsStandardSchemeFactory implements SchemeFactory { + private static class submitImage_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public submitImage_argsStandardScheme getScheme() { return new submitImage_argsStandardScheme(); } } - private static class submitImage_argsStandardScheme extends StandardScheme { + private static class submitImage_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -17734,13 +18115,13 @@ public class MasterServer { case 3: // BLOCK_HASHES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list322 = iprot.readListBegin(); - struct.blockHashes = new ArrayList(_list322.size); - ByteBuffer _elem323; - for (int _i324 = 0; _i324 < _list322.size; ++_i324) + org.apache.thrift.protocol.TList _list434 = iprot.readListBegin(); + struct.blockHashes = new java.util.ArrayList(_list434.size); + @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem435; + for (int _i436 = 0; _i436 < _list434.size; ++_i436) { - _elem323 = iprot.readBinary(); - struct.blockHashes.add(_elem323); + _elem435 = iprot.readBinary(); + struct.blockHashes.add(_elem435); } iprot.readListEnd(); } @@ -17778,9 +18159,9 @@ public class MasterServer { oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size())); - for (ByteBuffer _iter325 : struct.blockHashes) + for (java.nio.ByteBuffer _iter437 : struct.blockHashes) { - oprot.writeBinary(_iter325); + oprot.writeBinary(_iter437); } oprot.writeListEnd(); } @@ -17792,18 +18173,18 @@ public class MasterServer { } - private static class submitImage_argsTupleSchemeFactory implements SchemeFactory { + private static class submitImage_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public submitImage_argsTupleScheme getScheme() { return new submitImage_argsTupleScheme(); } } - private static class submitImage_argsTupleScheme extends TupleScheme { + private static class submitImage_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetUserToken()) { optionals.set(0); } @@ -17823,9 +18204,9 @@ public class MasterServer { if (struct.isSetBlockHashes()) { { oprot.writeI32(struct.blockHashes.size()); - for (ByteBuffer _iter326 : struct.blockHashes) + for (java.nio.ByteBuffer _iter438 : struct.blockHashes) { - oprot.writeBinary(_iter326); + oprot.writeBinary(_iter438); } } } @@ -17833,8 +18214,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.userToken = iprot.readString(); struct.setUserTokenIsSet(true); @@ -17846,13 +18227,13 @@ public class MasterServer { } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.blockHashes = new ArrayList(_list327.size); - ByteBuffer _elem328; - for (int _i329 = 0; _i329 < _list327.size; ++_i329) + org.apache.thrift.protocol.TList _list439 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); + struct.blockHashes = new java.util.ArrayList(_list439.size); + @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem440; + for (int _i441 = 0; _i441 < _list439.size; ++_i441) { - _elem328 = iprot.readBinary(); - struct.blockHashes.add(_elem328); + _elem440 = iprot.readBinary(); + struct.blockHashes.add(_elem440); } } struct.setBlockHashesIsSet(true); @@ -17860,6 +18241,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class submitImage_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -17870,16 +18254,13 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField FAILURE3_FIELD_DESC = new org.apache.thrift.protocol.TField("failure3", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new submitImage_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new submitImage_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new submitImage_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new submitImage_resultTupleSchemeFactory(); - public TransferInformation success; // required - public TAuthorizationException failure; // required - public TInvocationException failure2; // required - public TTransferRejectedException failure3; // required + public @org.apache.thrift.annotation.Nullable TransferInformation success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException failure2; // required + public @org.apache.thrift.annotation.Nullable TTransferRejectedException failure3; // 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 { @@ -17888,10 +18269,10 @@ public class MasterServer { FAILURE2((short)2, "failure2"), FAILURE3((short)3, "failure3"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -17899,6 +18280,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -17920,21 +18302,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -17943,24 +18326,24 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); tmpMap.put(_Fields.FAILURE3, new org.apache.thrift.meta_data.FieldMetaData("failure3", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTransferRejectedException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_result.class, metaDataMap); } @@ -18010,11 +18393,12 @@ public class MasterServer { this.failure3 = null; } + @org.apache.thrift.annotation.Nullable public TransferInformation getSuccess() { return this.success; } - public submitImage_result setSuccess(TransferInformation success) { + public submitImage_result setSuccess(@org.apache.thrift.annotation.Nullable TransferInformation success) { this.success = success; return this; } @@ -18034,11 +18418,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public submitImage_result setFailure(TAuthorizationException failure) { + public submitImage_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -18058,11 +18443,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getFailure2() { return this.failure2; } - public submitImage_result setFailure2(TInvocationException failure2) { + public submitImage_result setFailure2(@org.apache.thrift.annotation.Nullable TInvocationException failure2) { this.failure2 = failure2; return this; } @@ -18082,11 +18468,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TTransferRejectedException getFailure3() { return this.failure3; } - public submitImage_result setFailure3(TTransferRejectedException failure3) { + public submitImage_result setFailure3(@org.apache.thrift.annotation.Nullable TTransferRejectedException failure3) { this.failure3 = failure3; return this; } @@ -18106,7 +18493,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -18143,7 +18530,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -18158,13 +18546,13 @@ public class MasterServer { return getFailure3(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -18177,13 +18565,11 @@ public class MasterServer { case FAILURE3: return isSetFailure3(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof submitImage_result) return this.equals((submitImage_result)that); return false; @@ -18192,6 +18578,8 @@ public class MasterServer { public boolean equals(submitImage_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -18234,29 +18622,25 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_failure2 = true && (isSetFailure2()); - list.add(present_failure2); - if (present_failure2) - list.add(failure2); + hashCode = hashCode * 8191 + ((isSetFailure2()) ? 131071 : 524287); + if (isSetFailure2()) + hashCode = hashCode * 8191 + failure2.hashCode(); - boolean present_failure3 = true && (isSetFailure3()); - list.add(present_failure3); - if (present_failure3) - list.add(failure3); + hashCode = hashCode * 8191 + ((isSetFailure3()) ? 131071 : 524287); + if (isSetFailure3()) + hashCode = hashCode * 8191 + failure3.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -18267,7 +18651,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -18277,7 +18661,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -18287,7 +18671,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2()); + lastComparison = java.lang.Boolean.compare(isSetFailure2(), other.isSetFailure2()); if (lastComparison != 0) { return lastComparison; } @@ -18297,7 +18681,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3()); + lastComparison = java.lang.Boolean.compare(isSetFailure3(), other.isSetFailure3()); if (lastComparison != 0) { return lastComparison; } @@ -18310,21 +18694,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("submitImage_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("submitImage_result("); boolean first = true; sb.append("success:"); @@ -18378,7 +18763,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -18386,13 +18771,13 @@ public class MasterServer { } } - private static class submitImage_resultStandardSchemeFactory implements SchemeFactory { + private static class submitImage_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public submitImage_resultStandardScheme getScheme() { return new submitImage_resultStandardScheme(); } } - private static class submitImage_resultStandardScheme extends StandardScheme { + private static class submitImage_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -18481,18 +18866,18 @@ public class MasterServer { } - private static class submitImage_resultTupleSchemeFactory implements SchemeFactory { + private static class submitImage_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public submitImage_resultTupleScheme getScheme() { return new submitImage_resultTupleScheme(); } } - private static class submitImage_resultTupleScheme extends TupleScheme { + private static class submitImage_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -18522,8 +18907,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.success = new TransferInformation(); struct.success.read(iprot); @@ -18547,6 +18932,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class registerSatellite_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -18559,18 +18947,15 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField EXPONENT_FIELD_DESC = new org.apache.thrift.protocol.TField("exponent", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField CERTSHA256_FIELD_DESC = new org.apache.thrift.protocol.TField("certsha256", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new registerSatellite_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new registerSatellite_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new registerSatellite_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new registerSatellite_argsTupleSchemeFactory(); - public String userToken; // required - public String displayName; // required - public List addresses; // required - public String modulus; // required - public String exponent; // required - public ByteBuffer certsha256; // required + public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required + public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required + public @org.apache.thrift.annotation.Nullable java.util.List addresses; // required + public @org.apache.thrift.annotation.Nullable java.lang.String modulus; // required + public @org.apache.thrift.annotation.Nullable java.lang.String exponent; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer certsha256; // 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 { @@ -18581,10 +18966,10 @@ public class MasterServer { EXPONENT((short)4, "exponent"), CERTSHA256((short)1, "certsha256"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -18592,6 +18977,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 6: // USER_TOKEN @@ -18617,21 +19003,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -18640,15 +19027,15 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -18662,7 +19049,7 @@ public class MasterServer { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.CERTSHA256, new org.apache.thrift.meta_data.FieldMetaData("certsha256", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerSatellite_args.class, metaDataMap); } @@ -18670,12 +19057,12 @@ public class MasterServer { } public registerSatellite_args( - String userToken, - String displayName, - List addresses, - String modulus, - String exponent, - ByteBuffer certsha256) + java.lang.String userToken, + java.lang.String displayName, + java.util.List addresses, + java.lang.String modulus, + java.lang.String exponent, + java.nio.ByteBuffer certsha256) { this(); this.userToken = userToken; @@ -18697,7 +19084,7 @@ public class MasterServer { this.displayName = other.displayName; } if (other.isSetAddresses()) { - List __this__addresses = new ArrayList(other.addresses); + java.util.List __this__addresses = new java.util.ArrayList(other.addresses); this.addresses = __this__addresses; } if (other.isSetModulus()) { @@ -18725,11 +19112,12 @@ public class MasterServer { this.certsha256 = null; } - public String getUserToken() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getUserToken() { return this.userToken; } - public registerSatellite_args setUserToken(String userToken) { + public registerSatellite_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) { this.userToken = userToken; return this; } @@ -18749,11 +19137,12 @@ public class MasterServer { } } - public String getDisplayName() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getDisplayName() { return this.displayName; } - public registerSatellite_args setDisplayName(String displayName) { + public registerSatellite_args setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) { this.displayName = displayName; return this; } @@ -18777,22 +19166,24 @@ public class MasterServer { return (this.addresses == null) ? 0 : this.addresses.size(); } - public java.util.Iterator getAddressesIterator() { + @org.apache.thrift.annotation.Nullable + public java.util.Iterator getAddressesIterator() { return (this.addresses == null) ? null : this.addresses.iterator(); } - public void addToAddresses(String elem) { + public void addToAddresses(java.lang.String elem) { if (this.addresses == null) { - this.addresses = new ArrayList(); + this.addresses = new java.util.ArrayList(); } this.addresses.add(elem); } - public List getAddresses() { + @org.apache.thrift.annotation.Nullable + public java.util.List getAddresses() { return this.addresses; } - public registerSatellite_args setAddresses(List addresses) { + public registerSatellite_args setAddresses(@org.apache.thrift.annotation.Nullable java.util.List addresses) { this.addresses = addresses; return this; } @@ -18812,11 +19203,12 @@ public class MasterServer { } } - public String getModulus() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getModulus() { return this.modulus; } - public registerSatellite_args setModulus(String modulus) { + public registerSatellite_args setModulus(@org.apache.thrift.annotation.Nullable java.lang.String modulus) { this.modulus = modulus; return this; } @@ -18836,11 +19228,12 @@ public class MasterServer { } } - public String getExponent() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getExponent() { return this.exponent; } - public registerSatellite_args setExponent(String exponent) { + public registerSatellite_args setExponent(@org.apache.thrift.annotation.Nullable java.lang.String exponent) { this.exponent = exponent; return this; } @@ -18865,16 +19258,16 @@ public class MasterServer { return certsha256 == null ? null : certsha256.array(); } - public ByteBuffer bufferForCertsha256() { + public java.nio.ByteBuffer bufferForCertsha256() { return org.apache.thrift.TBaseHelper.copyBinary(certsha256); } public registerSatellite_args setCertsha256(byte[] certsha256) { - this.certsha256 = certsha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(certsha256, certsha256.length)); + this.certsha256 = certsha256 == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(certsha256.clone()); return this; } - public registerSatellite_args setCertsha256(ByteBuffer certsha256) { + public registerSatellite_args setCertsha256(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer certsha256) { this.certsha256 = org.apache.thrift.TBaseHelper.copyBinary(certsha256); return this; } @@ -18894,13 +19287,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case USER_TOKEN: if (value == null) { unsetUserToken(); } else { - setUserToken((String)value); + setUserToken((java.lang.String)value); } break; @@ -18908,7 +19301,7 @@ public class MasterServer { if (value == null) { unsetDisplayName(); } else { - setDisplayName((String)value); + setDisplayName((java.lang.String)value); } break; @@ -18916,7 +19309,7 @@ public class MasterServer { if (value == null) { unsetAddresses(); } else { - setAddresses((List)value); + setAddresses((java.util.List)value); } break; @@ -18924,7 +19317,7 @@ public class MasterServer { if (value == null) { unsetModulus(); } else { - setModulus((String)value); + setModulus((java.lang.String)value); } break; @@ -18932,7 +19325,7 @@ public class MasterServer { if (value == null) { unsetExponent(); } else { - setExponent((String)value); + setExponent((java.lang.String)value); } break; @@ -18940,14 +19333,19 @@ public class MasterServer { if (value == null) { unsetCertsha256(); } else { - setCertsha256((ByteBuffer)value); + if (value instanceof byte[]) { + setCertsha256((byte[])value); + } else { + setCertsha256((java.nio.ByteBuffer)value); + } } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case USER_TOKEN: return getUserToken(); @@ -18968,13 +19366,13 @@ public class MasterServer { return getCertsha256(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -18991,13 +19389,11 @@ public class MasterServer { case CERTSHA256: return isSetCertsha256(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof registerSatellite_args) return this.equals((registerSatellite_args)that); return false; @@ -19006,6 +19402,8 @@ public class MasterServer { public boolean equals(registerSatellite_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_userToken = true && this.isSetUserToken(); boolean that_present_userToken = true && that.isSetUserToken(); @@ -19066,39 +19464,33 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_userToken = true && (isSetUserToken()); - list.add(present_userToken); - if (present_userToken) - list.add(userToken); + hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287); + if (isSetUserToken()) + hashCode = hashCode * 8191 + userToken.hashCode(); - boolean present_displayName = true && (isSetDisplayName()); - list.add(present_displayName); - if (present_displayName) - list.add(displayName); + hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287); + if (isSetDisplayName()) + hashCode = hashCode * 8191 + displayName.hashCode(); - boolean present_addresses = true && (isSetAddresses()); - list.add(present_addresses); - if (present_addresses) - list.add(addresses); + hashCode = hashCode * 8191 + ((isSetAddresses()) ? 131071 : 524287); + if (isSetAddresses()) + hashCode = hashCode * 8191 + addresses.hashCode(); - boolean present_modulus = true && (isSetModulus()); - list.add(present_modulus); - if (present_modulus) - list.add(modulus); + hashCode = hashCode * 8191 + ((isSetModulus()) ? 131071 : 524287); + if (isSetModulus()) + hashCode = hashCode * 8191 + modulus.hashCode(); - boolean present_exponent = true && (isSetExponent()); - list.add(present_exponent); - if (present_exponent) - list.add(exponent); + hashCode = hashCode * 8191 + ((isSetExponent()) ? 131071 : 524287); + if (isSetExponent()) + hashCode = hashCode * 8191 + exponent.hashCode(); - boolean present_certsha256 = true && (isSetCertsha256()); - list.add(present_certsha256); - if (present_certsha256) - list.add(certsha256); + hashCode = hashCode * 8191 + ((isSetCertsha256()) ? 131071 : 524287); + if (isSetCertsha256()) + hashCode = hashCode * 8191 + certsha256.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -19109,7 +19501,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken()); + lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken()); if (lastComparison != 0) { return lastComparison; } @@ -19119,7 +19511,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName()); + lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName()); if (lastComparison != 0) { return lastComparison; } @@ -19129,7 +19521,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAddresses()).compareTo(other.isSetAddresses()); + lastComparison = java.lang.Boolean.compare(isSetAddresses(), other.isSetAddresses()); if (lastComparison != 0) { return lastComparison; } @@ -19139,7 +19531,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetModulus()).compareTo(other.isSetModulus()); + lastComparison = java.lang.Boolean.compare(isSetModulus(), other.isSetModulus()); if (lastComparison != 0) { return lastComparison; } @@ -19149,7 +19541,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetExponent()).compareTo(other.isSetExponent()); + lastComparison = java.lang.Boolean.compare(isSetExponent(), other.isSetExponent()); if (lastComparison != 0) { return lastComparison; } @@ -19159,7 +19551,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCertsha256()).compareTo(other.isSetCertsha256()); + lastComparison = java.lang.Boolean.compare(isSetCertsha256(), other.isSetCertsha256()); if (lastComparison != 0) { return lastComparison; } @@ -19172,21 +19564,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("registerSatellite_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("registerSatellite_args("); boolean first = true; sb.append("userToken:"); @@ -19253,7 +19646,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -19261,13 +19654,13 @@ public class MasterServer { } } - private static class registerSatellite_argsStandardSchemeFactory implements SchemeFactory { + private static class registerSatellite_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public registerSatellite_argsStandardScheme getScheme() { return new registerSatellite_argsStandardScheme(); } } - private static class registerSatellite_argsStandardScheme extends StandardScheme { + private static class registerSatellite_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, registerSatellite_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -19298,13 +19691,13 @@ public class MasterServer { case 2: // ADDRESSES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list330 = iprot.readListBegin(); - struct.addresses = new ArrayList(_list330.size); - String _elem331; - for (int _i332 = 0; _i332 < _list330.size; ++_i332) + org.apache.thrift.protocol.TList _list442 = iprot.readListBegin(); + struct.addresses = new java.util.ArrayList(_list442.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem443; + for (int _i444 = 0; _i444 < _list442.size; ++_i444) { - _elem331 = iprot.readString(); - struct.addresses.add(_elem331); + _elem443 = iprot.readString(); + struct.addresses.add(_elem443); } iprot.readListEnd(); } @@ -19361,9 +19754,9 @@ public class MasterServer { oprot.writeFieldBegin(ADDRESSES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addresses.size())); - for (String _iter333 : struct.addresses) + for (java.lang.String _iter445 : struct.addresses) { - oprot.writeString(_iter333); + oprot.writeString(_iter445); } oprot.writeListEnd(); } @@ -19395,18 +19788,18 @@ public class MasterServer { } - private static class registerSatellite_argsTupleSchemeFactory implements SchemeFactory { + private static class registerSatellite_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public registerSatellite_argsTupleScheme getScheme() { return new registerSatellite_argsTupleScheme(); } } - private static class registerSatellite_argsTupleScheme extends TupleScheme { + private static class registerSatellite_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, registerSatellite_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetUserToken()) { optionals.set(0); } @@ -19435,9 +19828,9 @@ public class MasterServer { if (struct.isSetAddresses()) { { oprot.writeI32(struct.addresses.size()); - for (String _iter334 : struct.addresses) + for (java.lang.String _iter446 : struct.addresses) { - oprot.writeString(_iter334); + oprot.writeString(_iter446); } } } @@ -19454,8 +19847,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, registerSatellite_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.userToken = iprot.readString(); struct.setUserTokenIsSet(true); @@ -19466,13 +19859,13 @@ public class MasterServer { } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list335 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.addresses = new ArrayList(_list335.size); - String _elem336; - for (int _i337 = 0; _i337 < _list335.size; ++_i337) + org.apache.thrift.protocol.TList _list447 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); + struct.addresses = new java.util.ArrayList(_list447.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem448; + for (int _i449 = 0; _i449 < _list447.size; ++_i449) { - _elem336 = iprot.readString(); - struct.addresses.add(_elem336); + _elem448 = iprot.readString(); + struct.addresses.add(_elem448); } } struct.setAddressesIsSet(true); @@ -19492,6 +19885,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class registerSatellite_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -19500,24 +19896,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new registerSatellite_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new registerSatellite_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new registerSatellite_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new registerSatellite_resultTupleSchemeFactory(); public int success; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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"), ERROR((short)1, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -19525,6 +19918,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -19542,21 +19936,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -19565,7 +19960,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -19573,14 +19968,14 @@ public class MasterServer { // 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; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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.I32))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerSatellite_result.class, metaDataMap); } @@ -19630,23 +20025,24 @@ public class MasterServer { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.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); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public registerSatellite_result setError(TInvocationException error) { + public registerSatellite_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -19666,13 +20062,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((Integer)value); + setSuccess((java.lang.Integer)value); } break; @@ -19687,7 +20083,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -19696,13 +20093,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -19711,13 +20108,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof registerSatellite_result) return this.equals((registerSatellite_result)that); return false; @@ -19726,6 +20121,8 @@ public class MasterServer { public boolean equals(registerSatellite_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true; boolean that_present_success = true; @@ -19750,19 +20147,15 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true; - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + success; - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -19773,7 +20166,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -19783,7 +20176,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -19796,21 +20189,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("registerSatellite_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("registerSatellite_result("); boolean first = true; sb.append("success:"); @@ -19841,7 +20235,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -19851,13 +20245,13 @@ public class MasterServer { } } - private static class registerSatellite_resultStandardSchemeFactory implements SchemeFactory { + private static class registerSatellite_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public registerSatellite_resultStandardScheme getScheme() { return new registerSatellite_resultStandardScheme(); } } - private static class registerSatellite_resultStandardScheme extends StandardScheme { + private static class registerSatellite_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, registerSatellite_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -19917,18 +20311,18 @@ public class MasterServer { } - private static class registerSatellite_resultTupleSchemeFactory implements SchemeFactory { + private static class registerSatellite_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public registerSatellite_resultTupleScheme getScheme() { return new registerSatellite_resultTupleScheme(); } } - private static class registerSatellite_resultTupleScheme extends TupleScheme { + private static class registerSatellite_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, registerSatellite_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -19946,8 +20340,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, registerSatellite_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.success = iprot.readI32(); struct.setSuccessIsSet(true); @@ -19960,6 +20354,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class updateSatellite_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -19969,15 +20366,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField DISPLAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("displayName", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("addresses", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new updateSatellite_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new updateSatellite_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateSatellite_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateSatellite_argsTupleSchemeFactory(); - public String serverSessionId; // required - public String displayName; // required - public List addresses; // required + public @org.apache.thrift.annotation.Nullable java.lang.String serverSessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required + public @org.apache.thrift.annotation.Nullable java.util.List addresses; // 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 { @@ -19985,10 +20379,10 @@ public class MasterServer { DISPLAY_NAME((short)2, "displayName"), ADDRESSES((short)3, "addresses"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -19996,6 +20390,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SERVER_SESSION_ID @@ -20015,21 +20410,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -20038,15 +20434,15 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -20054,7 +20450,7 @@ public class MasterServer { tmpMap.put(_Fields.ADDRESSES, new org.apache.thrift.meta_data.FieldMetaData("addresses", 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)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateSatellite_args.class, metaDataMap); } @@ -20062,9 +20458,9 @@ public class MasterServer { } public updateSatellite_args( - String serverSessionId, - String displayName, - List addresses) + java.lang.String serverSessionId, + java.lang.String displayName, + java.util.List addresses) { this(); this.serverSessionId = serverSessionId; @@ -20083,7 +20479,7 @@ public class MasterServer { this.displayName = other.displayName; } if (other.isSetAddresses()) { - List __this__addresses = new ArrayList(other.addresses); + java.util.List __this__addresses = new java.util.ArrayList(other.addresses); this.addresses = __this__addresses; } } @@ -20099,11 +20495,12 @@ public class MasterServer { this.addresses = null; } - public String getServerSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getServerSessionId() { return this.serverSessionId; } - public updateSatellite_args setServerSessionId(String serverSessionId) { + public updateSatellite_args setServerSessionId(@org.apache.thrift.annotation.Nullable java.lang.String serverSessionId) { this.serverSessionId = serverSessionId; return this; } @@ -20123,11 +20520,12 @@ public class MasterServer { } } - public String getDisplayName() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getDisplayName() { return this.displayName; } - public updateSatellite_args setDisplayName(String displayName) { + public updateSatellite_args setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) { this.displayName = displayName; return this; } @@ -20151,22 +20549,24 @@ public class MasterServer { return (this.addresses == null) ? 0 : this.addresses.size(); } - public java.util.Iterator getAddressesIterator() { + @org.apache.thrift.annotation.Nullable + public java.util.Iterator getAddressesIterator() { return (this.addresses == null) ? null : this.addresses.iterator(); } - public void addToAddresses(String elem) { + public void addToAddresses(java.lang.String elem) { if (this.addresses == null) { - this.addresses = new ArrayList(); + this.addresses = new java.util.ArrayList(); } this.addresses.add(elem); } - public List getAddresses() { + @org.apache.thrift.annotation.Nullable + public java.util.List getAddresses() { return this.addresses; } - public updateSatellite_args setAddresses(List addresses) { + public updateSatellite_args setAddresses(@org.apache.thrift.annotation.Nullable java.util.List addresses) { this.addresses = addresses; return this; } @@ -20186,13 +20586,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SERVER_SESSION_ID: if (value == null) { unsetServerSessionId(); } else { - setServerSessionId((String)value); + setServerSessionId((java.lang.String)value); } break; @@ -20200,7 +20600,7 @@ public class MasterServer { if (value == null) { unsetDisplayName(); } else { - setDisplayName((String)value); + setDisplayName((java.lang.String)value); } break; @@ -20208,14 +20608,15 @@ public class MasterServer { if (value == null) { unsetAddresses(); } else { - setAddresses((List)value); + setAddresses((java.util.List)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SERVER_SESSION_ID: return getServerSessionId(); @@ -20227,13 +20628,13 @@ public class MasterServer { return getAddresses(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -20244,13 +20645,11 @@ public class MasterServer { case ADDRESSES: return isSetAddresses(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof updateSatellite_args) return this.equals((updateSatellite_args)that); return false; @@ -20259,6 +20658,8 @@ public class MasterServer { public boolean equals(updateSatellite_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_serverSessionId = true && this.isSetServerSessionId(); boolean that_present_serverSessionId = true && that.isSetServerSessionId(); @@ -20292,24 +20693,21 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_serverSessionId = true && (isSetServerSessionId()); - list.add(present_serverSessionId); - if (present_serverSessionId) - list.add(serverSessionId); + hashCode = hashCode * 8191 + ((isSetServerSessionId()) ? 131071 : 524287); + if (isSetServerSessionId()) + hashCode = hashCode * 8191 + serverSessionId.hashCode(); - boolean present_displayName = true && (isSetDisplayName()); - list.add(present_displayName); - if (present_displayName) - list.add(displayName); + hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287); + if (isSetDisplayName()) + hashCode = hashCode * 8191 + displayName.hashCode(); - boolean present_addresses = true && (isSetAddresses()); - list.add(present_addresses); - if (present_addresses) - list.add(addresses); + hashCode = hashCode * 8191 + ((isSetAddresses()) ? 131071 : 524287); + if (isSetAddresses()) + hashCode = hashCode * 8191 + addresses.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -20320,7 +20718,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); + lastComparison = java.lang.Boolean.compare(isSetServerSessionId(), other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -20330,7 +20728,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName()); + lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName()); if (lastComparison != 0) { return lastComparison; } @@ -20340,7 +20738,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAddresses()).compareTo(other.isSetAddresses()); + lastComparison = java.lang.Boolean.compare(isSetAddresses(), other.isSetAddresses()); if (lastComparison != 0) { return lastComparison; } @@ -20353,21 +20751,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("updateSatellite_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("updateSatellite_args("); boolean first = true; sb.append("serverSessionId:"); @@ -20410,7 +20809,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -20418,13 +20817,13 @@ public class MasterServer { } } - private static class updateSatellite_argsStandardSchemeFactory implements SchemeFactory { + private static class updateSatellite_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public updateSatellite_argsStandardScheme getScheme() { return new updateSatellite_argsStandardScheme(); } } - private static class updateSatellite_argsStandardScheme extends StandardScheme { + private static class updateSatellite_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, updateSatellite_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -20455,13 +20854,13 @@ public class MasterServer { case 3: // ADDRESSES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list338 = iprot.readListBegin(); - struct.addresses = new ArrayList(_list338.size); - String _elem339; - for (int _i340 = 0; _i340 < _list338.size; ++_i340) + org.apache.thrift.protocol.TList _list450 = iprot.readListBegin(); + struct.addresses = new java.util.ArrayList(_list450.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem451; + for (int _i452 = 0; _i452 < _list450.size; ++_i452) { - _elem339 = iprot.readString(); - struct.addresses.add(_elem339); + _elem451 = iprot.readString(); + struct.addresses.add(_elem451); } iprot.readListEnd(); } @@ -20499,9 +20898,9 @@ public class MasterServer { oprot.writeFieldBegin(ADDRESSES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addresses.size())); - for (String _iter341 : struct.addresses) + for (java.lang.String _iter453 : struct.addresses) { - oprot.writeString(_iter341); + oprot.writeString(_iter453); } oprot.writeListEnd(); } @@ -20513,18 +20912,18 @@ public class MasterServer { } - private static class updateSatellite_argsTupleSchemeFactory implements SchemeFactory { + private static class updateSatellite_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public updateSatellite_argsTupleScheme getScheme() { return new updateSatellite_argsTupleScheme(); } } - private static class updateSatellite_argsTupleScheme extends TupleScheme { + private static class updateSatellite_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, updateSatellite_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetServerSessionId()) { optionals.set(0); } @@ -20544,9 +20943,9 @@ public class MasterServer { if (struct.isSetAddresses()) { { oprot.writeI32(struct.addresses.size()); - for (String _iter342 : struct.addresses) + for (java.lang.String _iter454 : struct.addresses) { - oprot.writeString(_iter342); + oprot.writeString(_iter454); } } } @@ -20554,8 +20953,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateSatellite_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.serverSessionId = iprot.readString(); struct.setServerSessionIdIsSet(true); @@ -20566,13 +20965,13 @@ public class MasterServer { } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list343 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.addresses = new ArrayList(_list343.size); - String _elem344; - for (int _i345 = 0; _i345 < _list343.size; ++_i345) + org.apache.thrift.protocol.TList _list455 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); + struct.addresses = new java.util.ArrayList(_list455.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem456; + for (int _i457 = 0; _i457 < _list455.size; ++_i457) { - _elem344 = iprot.readString(); - struct.addresses.add(_elem344); + _elem456 = iprot.readString(); + struct.addresses.add(_elem456); } } struct.setAddressesIsSet(true); @@ -20580,6 +20979,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class updateSatellite_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -20589,15 +20991,12 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new updateSatellite_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new updateSatellite_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateSatellite_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateSatellite_resultTupleSchemeFactory(); public boolean success; // required - public TAuthorizationException failure; // required - public TInvocationException error; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException error; // 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 { @@ -20605,10 +21004,10 @@ public class MasterServer { FAILURE((short)1, "failure"), ERROR((short)2, "error"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -20616,6 +21015,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -20635,21 +21035,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -20658,7 +21059,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -20666,16 +21067,16 @@ public class MasterServer { // 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; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.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))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateSatellite_result.class, metaDataMap); } @@ -20731,23 +21132,24 @@ public class MasterServer { } public void unsetSuccess() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + __isset_bitfield = org.apache.thrift.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); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); } public void setSuccessIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public updateSatellite_result setFailure(TAuthorizationException failure) { + public updateSatellite_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -20767,11 +21169,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getError() { return this.error; } - public updateSatellite_result setError(TInvocationException error) { + public updateSatellite_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) { this.error = error; return this; } @@ -20791,13 +21194,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((Boolean)value); + setSuccess((java.lang.Boolean)value); } break; @@ -20820,7 +21223,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return isSuccess(); @@ -20832,13 +21236,13 @@ public class MasterServer { return getError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -20849,13 +21253,11 @@ public class MasterServer { case ERROR: return isSetError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof updateSatellite_result) return this.equals((updateSatellite_result)that); return false; @@ -20864,6 +21266,8 @@ public class MasterServer { public boolean equals(updateSatellite_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true; boolean that_present_success = true; @@ -20897,24 +21301,19 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true; - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((success) ? 131071 : 524287); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_error = true && (isSetError()); - list.add(present_error); - if (present_error) - list.add(error); + hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287); + if (isSetError()) + hashCode = hashCode * 8191 + error.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -20925,7 +21324,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -20935,7 +21334,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -20945,7 +21344,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError()); + lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError()); if (lastComparison != 0) { return lastComparison; } @@ -20958,21 +21357,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("updateSatellite_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("updateSatellite_result("); boolean first = true; sb.append("success:"); @@ -21011,7 +21411,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -21021,13 +21421,13 @@ public class MasterServer { } } - private static class updateSatellite_resultStandardSchemeFactory implements SchemeFactory { + private static class updateSatellite_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public updateSatellite_resultStandardScheme getScheme() { return new updateSatellite_resultStandardScheme(); } } - private static class updateSatellite_resultStandardScheme extends StandardScheme { + private static class updateSatellite_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, updateSatellite_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -21101,18 +21501,18 @@ public class MasterServer { } - private static class updateSatellite_resultTupleSchemeFactory implements SchemeFactory { + private static class updateSatellite_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public updateSatellite_resultTupleScheme getScheme() { return new updateSatellite_resultTupleScheme(); } } - private static class updateSatellite_resultTupleScheme extends TupleScheme { + private static class updateSatellite_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, updateSatellite_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -21136,8 +21536,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateSatellite_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(3); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.success = iprot.readBool(); struct.setSuccessIsSet(true); @@ -21155,6 +21555,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class downloadImage_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -21163,24 +21566,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new downloadImage_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new downloadImage_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new downloadImage_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new downloadImage_argsTupleSchemeFactory(); - public String sessionId; // required - public String imageVersionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required + public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // 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 { SESSION_ID((short)2, "sessionId"), IMAGE_VERSION_ID((short)1, "imageVersionId"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -21188,6 +21588,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 2: // SESSION_ID @@ -21205,21 +21606,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -21228,20 +21630,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "UUID"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadImage_args.class, metaDataMap); } @@ -21249,8 +21651,8 @@ public class MasterServer { } public downloadImage_args( - String sessionId, - String imageVersionId) + java.lang.String sessionId, + java.lang.String imageVersionId) { this(); this.sessionId = sessionId; @@ -21279,11 +21681,12 @@ public class MasterServer { this.imageVersionId = null; } - public String getSessionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getSessionId() { return this.sessionId; } - public downloadImage_args setSessionId(String sessionId) { + public downloadImage_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) { this.sessionId = sessionId; return this; } @@ -21303,11 +21706,12 @@ public class MasterServer { } } - public String getImageVersionId() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getImageVersionId() { return this.imageVersionId; } - public downloadImage_args setImageVersionId(String imageVersionId) { + public downloadImage_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) { this.imageVersionId = imageVersionId; return this; } @@ -21327,13 +21731,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SESSION_ID: if (value == null) { unsetSessionId(); } else { - setSessionId((String)value); + setSessionId((java.lang.String)value); } break; @@ -21341,14 +21745,15 @@ public class MasterServer { if (value == null) { unsetImageVersionId(); } else { - setImageVersionId((String)value); + setImageVersionId((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SESSION_ID: return getSessionId(); @@ -21357,13 +21762,13 @@ public class MasterServer { return getImageVersionId(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -21372,13 +21777,11 @@ public class MasterServer { case IMAGE_VERSION_ID: return isSetImageVersionId(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof downloadImage_args) return this.equals((downloadImage_args)that); return false; @@ -21387,6 +21790,8 @@ public class MasterServer { public boolean equals(downloadImage_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_sessionId = true && this.isSetSessionId(); boolean that_present_sessionId = true && that.isSetSessionId(); @@ -21411,19 +21816,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_sessionId = true && (isSetSessionId()); - list.add(present_sessionId); - if (present_sessionId) - list.add(sessionId); + hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287); + if (isSetSessionId()) + hashCode = hashCode * 8191 + sessionId.hashCode(); - boolean present_imageVersionId = true && (isSetImageVersionId()); - list.add(present_imageVersionId); - if (present_imageVersionId) - list.add(imageVersionId); + hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287); + if (isSetImageVersionId()) + hashCode = hashCode * 8191 + imageVersionId.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -21434,7 +21837,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } @@ -21444,7 +21847,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId()); + lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId()); if (lastComparison != 0) { return lastComparison; } @@ -21457,21 +21860,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("downloadImage_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("downloadImage_args("); boolean first = true; sb.append("sessionId:"); @@ -21506,7 +21910,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -21514,13 +21918,13 @@ public class MasterServer { } } - private static class downloadImage_argsStandardSchemeFactory implements SchemeFactory { + private static class downloadImage_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public downloadImage_argsStandardScheme getScheme() { return new downloadImage_argsStandardScheme(); } } - private static class downloadImage_argsStandardScheme extends StandardScheme { + private static class downloadImage_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, downloadImage_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -21579,18 +21983,18 @@ public class MasterServer { } - private static class downloadImage_argsTupleSchemeFactory implements SchemeFactory { + private static class downloadImage_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public downloadImage_argsTupleScheme getScheme() { return new downloadImage_argsTupleScheme(); } } - private static class downloadImage_argsTupleScheme extends TupleScheme { + private static class downloadImage_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, downloadImage_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSessionId()) { optionals.set(0); } @@ -21608,8 +22012,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, downloadImage_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.sessionId = iprot.readString(); struct.setSessionIdIsSet(true); @@ -21621,6 +22025,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class downloadImage_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -21631,16 +22038,13 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField F3_FIELD_DESC = new org.apache.thrift.protocol.TField("f3", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new downloadImage_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new downloadImage_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new downloadImage_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new downloadImage_resultTupleSchemeFactory(); - public TransferInformation success; // required - public TAuthorizationException failure; // required - public TInvocationException failure2; // required - public TNotFoundException f3; // required + public @org.apache.thrift.annotation.Nullable TransferInformation success; // required + public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required + public @org.apache.thrift.annotation.Nullable TInvocationException failure2; // required + public @org.apache.thrift.annotation.Nullable TNotFoundException f3; // 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 { @@ -21649,10 +22053,10 @@ public class MasterServer { FAILURE2((short)2, "failure2"), F3((short)3, "f3"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -21660,6 +22064,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -21681,21 +22086,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -21704,24 +22110,24 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class))); tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class))); tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadImage_result.class, metaDataMap); } @@ -21771,11 +22177,12 @@ public class MasterServer { this.f3 = null; } + @org.apache.thrift.annotation.Nullable public TransferInformation getSuccess() { return this.success; } - public downloadImage_result setSuccess(TransferInformation success) { + public downloadImage_result setSuccess(@org.apache.thrift.annotation.Nullable TransferInformation success) { this.success = success; return this; } @@ -21795,11 +22202,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TAuthorizationException getFailure() { return this.failure; } - public downloadImage_result setFailure(TAuthorizationException failure) { + public downloadImage_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) { this.failure = failure; return this; } @@ -21819,11 +22227,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getFailure2() { return this.failure2; } - public downloadImage_result setFailure2(TInvocationException failure2) { + public downloadImage_result setFailure2(@org.apache.thrift.annotation.Nullable TInvocationException failure2) { this.failure2 = failure2; return this; } @@ -21843,11 +22252,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TNotFoundException getF3() { return this.f3; } - public downloadImage_result setF3(TNotFoundException f3) { + public downloadImage_result setF3(@org.apache.thrift.annotation.Nullable TNotFoundException f3) { this.f3 = f3; return this; } @@ -21867,7 +22277,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -21904,7 +22314,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -21919,13 +22330,13 @@ public class MasterServer { return getF3(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -21938,13 +22349,11 @@ public class MasterServer { case F3: return isSetF3(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof downloadImage_result) return this.equals((downloadImage_result)that); return false; @@ -21953,6 +22362,8 @@ public class MasterServer { public boolean equals(downloadImage_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -21995,29 +22406,25 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_failure = true && (isSetFailure()); - list.add(present_failure); - if (present_failure) - list.add(failure); + hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287); + if (isSetFailure()) + hashCode = hashCode * 8191 + failure.hashCode(); - boolean present_failure2 = true && (isSetFailure2()); - list.add(present_failure2); - if (present_failure2) - list.add(failure2); + hashCode = hashCode * 8191 + ((isSetFailure2()) ? 131071 : 524287); + if (isSetFailure2()) + hashCode = hashCode * 8191 + failure2.hashCode(); - boolean present_f3 = true && (isSetF3()); - list.add(present_f3); - if (present_f3) - list.add(f3); + hashCode = hashCode * 8191 + ((isSetF3()) ? 131071 : 524287); + if (isSetF3()) + hashCode = hashCode * 8191 + f3.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -22028,7 +22435,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -22038,7 +22445,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } @@ -22048,7 +22455,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2()); + lastComparison = java.lang.Boolean.compare(isSetFailure2(), other.isSetFailure2()); if (lastComparison != 0) { return lastComparison; } @@ -22058,7 +22465,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetF3()).compareTo(other.isSetF3()); + lastComparison = java.lang.Boolean.compare(isSetF3(), other.isSetF3()); if (lastComparison != 0) { return lastComparison; } @@ -22071,21 +22478,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("downloadImage_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("downloadImage_result("); boolean first = true; sb.append("success:"); @@ -22139,7 +22547,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -22147,13 +22555,13 @@ public class MasterServer { } } - private static class downloadImage_resultStandardSchemeFactory implements SchemeFactory { + private static class downloadImage_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public downloadImage_resultStandardScheme getScheme() { return new downloadImage_resultStandardScheme(); } } - private static class downloadImage_resultStandardScheme extends StandardScheme { + private static class downloadImage_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, downloadImage_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -22242,18 +22650,18 @@ public class MasterServer { } - private static class downloadImage_resultTupleSchemeFactory implements SchemeFactory { + private static class downloadImage_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public downloadImage_resultTupleScheme getScheme() { return new downloadImage_resultTupleScheme(); } } - private static class downloadImage_resultTupleScheme extends TupleScheme { + private static class downloadImage_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, downloadImage_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -22283,8 +22691,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, downloadImage_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.success = new TransferInformation(); struct.success.read(iprot); @@ -22308,27 +22716,27 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getOrganizations_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_args"); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getOrganizations_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getOrganizations_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOrganizations_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOrganizations_argsTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -22336,6 +22744,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { default: @@ -22349,21 +22758,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -22372,14 +22782,14 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOrganizations_args.class, metaDataMap); } @@ -22400,32 +22810,31 @@ public class MasterServer { public void clear() { } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getOrganizations_args) return this.equals((getOrganizations_args)that); return false; @@ -22434,15 +22843,17 @@ public class MasterServer { public boolean equals(getOrganizations_args that) { if (that == null) return false; + if (this == that) + return true; return true; } @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - return list.hashCode(); + return hashCode; } @Override @@ -22456,21 +22867,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getOrganizations_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getOrganizations_args("); boolean first = true; sb.append(")"); @@ -22490,7 +22902,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -22498,13 +22910,13 @@ public class MasterServer { } } - private static class getOrganizations_argsStandardSchemeFactory implements SchemeFactory { + private static class getOrganizations_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOrganizations_argsStandardScheme getScheme() { return new getOrganizations_argsStandardScheme(); } } - private static class getOrganizations_argsStandardScheme extends StandardScheme { + private static class getOrganizations_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getOrganizations_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -22537,25 +22949,28 @@ public class MasterServer { } - private static class getOrganizations_argsTupleSchemeFactory implements SchemeFactory { + private static class getOrganizations_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOrganizations_argsTupleScheme getScheme() { return new getOrganizations_argsTupleScheme(); } } - private static class getOrganizations_argsTupleScheme extends TupleScheme { + private static class getOrganizations_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getOrganizations_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getOrganizations_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getOrganizations_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -22564,24 +22979,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getOrganizations_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getOrganizations_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOrganizations_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOrganizations_resultTupleSchemeFactory(); - public List success; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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"), SERVER_ERROR((short)1, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -22589,6 +23001,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -22606,21 +23019,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -22629,21 +23043,21 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Organization.class)))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOrganizations_result.class, metaDataMap); } @@ -22651,7 +23065,7 @@ public class MasterServer { } public getOrganizations_result( - List success, + java.util.List success, TInvocationException serverError) { this(); @@ -22664,7 +23078,7 @@ public class MasterServer { */ public getOrganizations_result(getOrganizations_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (Organization other_element : other.success) { __this__success.add(new Organization(other_element)); } @@ -22689,22 +23103,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(Organization elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public getOrganizations_result setSuccess(List success) { + public getOrganizations_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -22724,11 +23140,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getOrganizations_result setServerError(TInvocationException serverError) { + public getOrganizations_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -22748,13 +23165,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -22769,7 +23186,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -22778,13 +23196,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -22793,13 +23211,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getOrganizations_result) return this.equals((getOrganizations_result)that); return false; @@ -22808,6 +23224,8 @@ public class MasterServer { public boolean equals(getOrganizations_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -22832,19 +23250,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -22855,7 +23271,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -22865,7 +23281,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -22878,21 +23294,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getOrganizations_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getOrganizations_result("); boolean first = true; sb.append("success:"); @@ -22927,7 +23344,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -22935,13 +23352,13 @@ public class MasterServer { } } - private static class getOrganizations_resultStandardSchemeFactory implements SchemeFactory { + private static class getOrganizations_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOrganizations_resultStandardScheme getScheme() { return new getOrganizations_resultStandardScheme(); } } - private static class getOrganizations_resultStandardScheme extends StandardScheme { + private static class getOrganizations_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getOrganizations_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -22956,14 +23373,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list346 = iprot.readListBegin(); - struct.success = new ArrayList(_list346.size); - Organization _elem347; - for (int _i348 = 0; _i348 < _list346.size; ++_i348) + org.apache.thrift.protocol.TList _list458 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list458.size); + @org.apache.thrift.annotation.Nullable Organization _elem459; + for (int _i460 = 0; _i460 < _list458.size; ++_i460) { - _elem347 = new Organization(); - _elem347.read(iprot); - struct.success.add(_elem347); + _elem459 = new Organization(); + _elem459.read(iprot); + struct.success.add(_elem459); } iprot.readListEnd(); } @@ -23000,9 +23417,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (Organization _iter349 : struct.success) + for (Organization _iter461 : struct.success) { - _iter349.write(oprot); + _iter461.write(oprot); } oprot.writeListEnd(); } @@ -23019,18 +23436,18 @@ public class MasterServer { } - private static class getOrganizations_resultTupleSchemeFactory implements SchemeFactory { + private static class getOrganizations_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOrganizations_resultTupleScheme getScheme() { return new getOrganizations_resultTupleScheme(); } } - private static class getOrganizations_resultTupleScheme extends TupleScheme { + private static class getOrganizations_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getOrganizations_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -23041,9 +23458,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (Organization _iter350 : struct.success) + for (Organization _iter462 : struct.success) { - _iter350.write(oprot); + _iter462.write(oprot); } } } @@ -23054,18 +23471,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getOrganizations_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list351 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list351.size); - Organization _elem352; - for (int _i353 = 0; _i353 < _list351.size; ++_i353) + org.apache.thrift.protocol.TList _list463 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list463.size); + @org.apache.thrift.annotation.Nullable Organization _elem464; + for (int _i465 = 0; _i465 < _list463.size; ++_i465) { - _elem352 = new Organization(); - _elem352.read(iprot); - struct.success.add(_elem352); + _elem464 = new Organization(); + _elem464.read(iprot); + struct.success.add(_elem464); } } struct.setSuccessIsSet(true); @@ -23078,27 +23495,27 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getOperatingSystems_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOperatingSystems_args"); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getOperatingSystems_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getOperatingSystems_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOperatingSystems_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOperatingSystems_argsTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -23106,6 +23523,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { default: @@ -23119,21 +23537,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -23142,14 +23561,14 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOperatingSystems_args.class, metaDataMap); } @@ -23170,32 +23589,31 @@ public class MasterServer { public void clear() { } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getOperatingSystems_args) return this.equals((getOperatingSystems_args)that); return false; @@ -23204,15 +23622,17 @@ public class MasterServer { public boolean equals(getOperatingSystems_args that) { if (that == null) return false; + if (this == that) + return true; return true; } @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - return list.hashCode(); + return hashCode; } @Override @@ -23226,21 +23646,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getOperatingSystems_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getOperatingSystems_args("); boolean first = true; sb.append(")"); @@ -23260,7 +23681,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -23268,13 +23689,13 @@ public class MasterServer { } } - private static class getOperatingSystems_argsStandardSchemeFactory implements SchemeFactory { + private static class getOperatingSystems_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOperatingSystems_argsStandardScheme getScheme() { return new getOperatingSystems_argsStandardScheme(); } } - private static class getOperatingSystems_argsStandardScheme extends StandardScheme { + private static class getOperatingSystems_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getOperatingSystems_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -23307,25 +23728,28 @@ public class MasterServer { } - private static class getOperatingSystems_argsTupleSchemeFactory implements SchemeFactory { + private static class getOperatingSystems_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOperatingSystems_argsTupleScheme getScheme() { return new getOperatingSystems_argsTupleScheme(); } } - private static class getOperatingSystems_argsTupleScheme extends TupleScheme { + private static class getOperatingSystems_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getOperatingSystems_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -23334,24 +23758,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getOperatingSystems_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getOperatingSystems_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOperatingSystems_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOperatingSystems_resultTupleSchemeFactory(); - public List success; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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"), SERVER_ERROR((short)1, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -23359,6 +23780,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -23376,21 +23798,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -23399,21 +23822,21 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, OperatingSystem.class)))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOperatingSystems_result.class, metaDataMap); } @@ -23421,7 +23844,7 @@ public class MasterServer { } public getOperatingSystems_result( - List success, + java.util.List success, TInvocationException serverError) { this(); @@ -23434,7 +23857,7 @@ public class MasterServer { */ public getOperatingSystems_result(getOperatingSystems_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (OperatingSystem other_element : other.success) { __this__success.add(new OperatingSystem(other_element)); } @@ -23459,22 +23882,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(OperatingSystem elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public getOperatingSystems_result setSuccess(List success) { + public getOperatingSystems_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -23494,11 +23919,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getOperatingSystems_result setServerError(TInvocationException serverError) { + public getOperatingSystems_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -23518,13 +23944,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -23539,7 +23965,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -23548,13 +23975,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -23563,13 +23990,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getOperatingSystems_result) return this.equals((getOperatingSystems_result)that); return false; @@ -23578,6 +24003,8 @@ public class MasterServer { public boolean equals(getOperatingSystems_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -23602,19 +24029,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -23625,7 +24050,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -23635,7 +24060,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -23648,21 +24073,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getOperatingSystems_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getOperatingSystems_result("); boolean first = true; sb.append("success:"); @@ -23697,7 +24123,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -23705,13 +24131,13 @@ public class MasterServer { } } - private static class getOperatingSystems_resultStandardSchemeFactory implements SchemeFactory { + private static class getOperatingSystems_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOperatingSystems_resultStandardScheme getScheme() { return new getOperatingSystems_resultStandardScheme(); } } - private static class getOperatingSystems_resultStandardScheme extends StandardScheme { + private static class getOperatingSystems_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getOperatingSystems_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -23726,14 +24152,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list354 = iprot.readListBegin(); - struct.success = new ArrayList(_list354.size); - OperatingSystem _elem355; - for (int _i356 = 0; _i356 < _list354.size; ++_i356) + org.apache.thrift.protocol.TList _list466 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list466.size); + @org.apache.thrift.annotation.Nullable OperatingSystem _elem467; + for (int _i468 = 0; _i468 < _list466.size; ++_i468) { - _elem355 = new OperatingSystem(); - _elem355.read(iprot); - struct.success.add(_elem355); + _elem467 = new OperatingSystem(); + _elem467.read(iprot); + struct.success.add(_elem467); } iprot.readListEnd(); } @@ -23770,9 +24196,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (OperatingSystem _iter357 : struct.success) + for (OperatingSystem _iter469 : struct.success) { - _iter357.write(oprot); + _iter469.write(oprot); } oprot.writeListEnd(); } @@ -23789,18 +24215,18 @@ public class MasterServer { } - private static class getOperatingSystems_resultTupleSchemeFactory implements SchemeFactory { + private static class getOperatingSystems_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getOperatingSystems_resultTupleScheme getScheme() { return new getOperatingSystems_resultTupleScheme(); } } - private static class getOperatingSystems_resultTupleScheme extends TupleScheme { + private static class getOperatingSystems_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -23811,9 +24237,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (OperatingSystem _iter358 : struct.success) + for (OperatingSystem _iter470 : struct.success) { - _iter358.write(oprot); + _iter470.write(oprot); } } } @@ -23824,18 +24250,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list359 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list359.size); - OperatingSystem _elem360; - for (int _i361 = 0; _i361 < _list359.size; ++_i361) + org.apache.thrift.protocol.TList _list471 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list471.size); + @org.apache.thrift.annotation.Nullable OperatingSystem _elem472; + for (int _i473 = 0; _i473 < _list471.size; ++_i473) { - _elem360 = new OperatingSystem(); - _elem360.read(iprot); - struct.success.add(_elem360); + _elem472 = new OperatingSystem(); + _elem472.read(iprot); + struct.success.add(_elem472); } } struct.setSuccessIsSet(true); @@ -23848,27 +24274,27 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getVirtualizers_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVirtualizers_args"); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getVirtualizers_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getVirtualizers_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVirtualizers_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVirtualizers_argsTupleSchemeFactory(); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -23876,6 +24302,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { default: @@ -23889,21 +24316,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -23912,14 +24340,14 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - metaDataMap = Collections.unmodifiableMap(tmpMap); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVirtualizers_args.class, metaDataMap); } @@ -23940,32 +24368,31 @@ public class MasterServer { public void clear() { } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getVirtualizers_args) return this.equals((getVirtualizers_args)that); return false; @@ -23974,15 +24401,17 @@ public class MasterServer { public boolean equals(getVirtualizers_args that) { if (that == null) return false; + if (this == that) + return true; return true; } @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - return list.hashCode(); + return hashCode; } @Override @@ -23996,21 +24425,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getVirtualizers_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getVirtualizers_args("); boolean first = true; sb.append(")"); @@ -24030,7 +24460,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -24038,13 +24468,13 @@ public class MasterServer { } } - private static class getVirtualizers_argsStandardSchemeFactory implements SchemeFactory { + private static class getVirtualizers_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getVirtualizers_argsStandardScheme getScheme() { return new getVirtualizers_argsStandardScheme(); } } - private static class getVirtualizers_argsStandardScheme extends StandardScheme { + private static class getVirtualizers_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getVirtualizers_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -24077,25 +24507,28 @@ public class MasterServer { } - private static class getVirtualizers_argsTupleSchemeFactory implements SchemeFactory { + private static class getVirtualizers_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getVirtualizers_argsTupleScheme getScheme() { return new getVirtualizers_argsTupleScheme(); } } - private static class getVirtualizers_argsTupleScheme extends TupleScheme { + private static class getVirtualizers_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getVirtualizers_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -24104,24 +24537,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getVirtualizers_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getVirtualizers_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVirtualizers_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVirtualizers_resultTupleSchemeFactory(); - public List success; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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"), SERVER_ERROR((short)1, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -24129,6 +24559,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -24146,21 +24577,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -24169,21 +24601,21 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Virtualizer.class)))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVirtualizers_result.class, metaDataMap); } @@ -24191,7 +24623,7 @@ public class MasterServer { } public getVirtualizers_result( - List success, + java.util.List success, TInvocationException serverError) { this(); @@ -24204,7 +24636,7 @@ public class MasterServer { */ public getVirtualizers_result(getVirtualizers_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (Virtualizer other_element : other.success) { __this__success.add(new Virtualizer(other_element)); } @@ -24229,22 +24661,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(Virtualizer elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public getVirtualizers_result setSuccess(List success) { + public getVirtualizers_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -24264,11 +24698,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getVirtualizers_result setServerError(TInvocationException serverError) { + public getVirtualizers_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -24288,13 +24723,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -24309,7 +24744,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -24318,13 +24754,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -24333,13 +24769,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getVirtualizers_result) return this.equals((getVirtualizers_result)that); return false; @@ -24348,6 +24782,8 @@ public class MasterServer { public boolean equals(getVirtualizers_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -24372,19 +24808,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -24395,7 +24829,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -24405,7 +24839,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -24418,21 +24852,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getVirtualizers_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getVirtualizers_result("); boolean first = true; sb.append("success:"); @@ -24467,7 +24902,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -24475,13 +24910,13 @@ public class MasterServer { } } - private static class getVirtualizers_resultStandardSchemeFactory implements SchemeFactory { + private static class getVirtualizers_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getVirtualizers_resultStandardScheme getScheme() { return new getVirtualizers_resultStandardScheme(); } } - private static class getVirtualizers_resultStandardScheme extends StandardScheme { + private static class getVirtualizers_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getVirtualizers_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -24496,14 +24931,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list362 = iprot.readListBegin(); - struct.success = new ArrayList(_list362.size); - Virtualizer _elem363; - for (int _i364 = 0; _i364 < _list362.size; ++_i364) + org.apache.thrift.protocol.TList _list474 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list474.size); + @org.apache.thrift.annotation.Nullable Virtualizer _elem475; + for (int _i476 = 0; _i476 < _list474.size; ++_i476) { - _elem363 = new Virtualizer(); - _elem363.read(iprot); - struct.success.add(_elem363); + _elem475 = new Virtualizer(); + _elem475.read(iprot); + struct.success.add(_elem475); } iprot.readListEnd(); } @@ -24540,9 +24975,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (Virtualizer _iter365 : struct.success) + for (Virtualizer _iter477 : struct.success) { - _iter365.write(oprot); + _iter477.write(oprot); } oprot.writeListEnd(); } @@ -24559,18 +24994,18 @@ public class MasterServer { } - private static class getVirtualizers_resultTupleSchemeFactory implements SchemeFactory { + private static class getVirtualizers_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getVirtualizers_resultTupleScheme getScheme() { return new getVirtualizers_resultTupleScheme(); } } - private static class getVirtualizers_resultTupleScheme extends TupleScheme { + private static class getVirtualizers_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -24581,9 +25016,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (Virtualizer _iter366 : struct.success) + for (Virtualizer _iter478 : struct.success) { - _iter366.write(oprot); + _iter478.write(oprot); } } } @@ -24594,18 +25029,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list367 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list367.size); - Virtualizer _elem368; - for (int _i369 = 0; _i369 < _list367.size; ++_i369) + org.apache.thrift.protocol.TList _list479 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list479.size); + @org.apache.thrift.annotation.Nullable Virtualizer _elem480; + for (int _i481 = 0; _i481 < _list479.size; ++_i481) { - _elem368 = new Virtualizer(); - _elem368.read(iprot); - struct.success.add(_elem368); + _elem480 = new Virtualizer(); + _elem480.read(iprot); + struct.success.add(_elem480); } } struct.setSuccessIsSet(true); @@ -24618,6 +25053,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getTags_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -24625,11 +25063,8 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.I64, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getTags_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getTags_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getTags_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getTags_argsTupleSchemeFactory(); public long startDate; // required @@ -24637,10 +25072,10 @@ public class MasterServer { public enum _Fields implements org.apache.thrift.TFieldIdEnum { START_DATE((short)1, "startDate"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -24648,6 +25083,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // START_DATE @@ -24663,21 +25099,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -24686,7 +25123,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -24694,12 +25131,12 @@ public class MasterServer { // isset id assignments private static final int __STARTDATE_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.START_DATE, new org.apache.thrift.meta_data.FieldMetaData("startDate", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "UnixTimestamp"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTags_args.class, metaDataMap); } @@ -24743,57 +25180,56 @@ public class MasterServer { } public void unsetStartDate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID); } /** Returns true if field startDate is set (has been assigned a value) and false otherwise */ public boolean isSetStartDate() { - return EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID); } public void setStartDateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case START_DATE: if (value == null) { unsetStartDate(); } else { - setStartDate((Long)value); + setStartDate((java.lang.Long)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case START_DATE: return getStartDate(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case START_DATE: return isSetStartDate(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getTags_args) return this.equals((getTags_args)that); return false; @@ -24802,6 +25238,8 @@ public class MasterServer { public boolean equals(getTags_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_startDate = true; boolean that_present_startDate = true; @@ -24817,14 +25255,11 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_startDate = true; - list.add(present_startDate); - if (present_startDate) - list.add(startDate); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startDate); - return list.hashCode(); + return hashCode; } @Override @@ -24835,7 +25270,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetStartDate()).compareTo(other.isSetStartDate()); + lastComparison = java.lang.Boolean.compare(isSetStartDate(), other.isSetStartDate()); if (lastComparison != 0) { return lastComparison; } @@ -24848,21 +25283,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getTags_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getTags_args("); boolean first = true; sb.append("startDate:"); @@ -24885,7 +25321,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -24895,13 +25331,13 @@ public class MasterServer { } } - private static class getTags_argsStandardSchemeFactory implements SchemeFactory { + private static class getTags_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getTags_argsStandardScheme getScheme() { return new getTags_argsStandardScheme(); } } - private static class getTags_argsStandardScheme extends StandardScheme { + private static class getTags_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getTags_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -24945,18 +25381,18 @@ public class MasterServer { } - private static class getTags_argsTupleSchemeFactory implements SchemeFactory { + private static class getTags_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getTags_argsTupleScheme getScheme() { return new getTags_argsTupleScheme(); } } - private static class getTags_argsTupleScheme extends TupleScheme { + private static class getTags_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getTags_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetStartDate()) { optionals.set(0); } @@ -24968,8 +25404,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getTags_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.startDate = iprot.readI64(); struct.setStartDateIsSet(true); @@ -24977,6 +25413,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getTags_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -24985,24 +25424,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getTags_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getTags_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getTags_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getTags_resultTupleSchemeFactory(); - public List success; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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"), SERVER_ERROR((short)1, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -25010,6 +25446,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -25027,21 +25464,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -25050,21 +25488,21 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MasterTag.class)))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTags_result.class, metaDataMap); } @@ -25072,7 +25510,7 @@ public class MasterServer { } public getTags_result( - List success, + java.util.List success, TInvocationException serverError) { this(); @@ -25085,7 +25523,7 @@ public class MasterServer { */ public getTags_result(getTags_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (MasterTag other_element : other.success) { __this__success.add(new MasterTag(other_element)); } @@ -25110,22 +25548,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(MasterTag elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public getTags_result setSuccess(List success) { + public getTags_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -25145,11 +25585,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getTags_result setServerError(TInvocationException serverError) { + public getTags_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -25169,13 +25610,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -25190,7 +25631,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -25199,13 +25641,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -25214,13 +25656,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getTags_result) return this.equals((getTags_result)that); return false; @@ -25229,6 +25669,8 @@ public class MasterServer { public boolean equals(getTags_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -25253,19 +25695,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -25276,7 +25716,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -25286,7 +25726,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -25299,21 +25739,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getTags_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getTags_result("); boolean first = true; sb.append("success:"); @@ -25348,7 +25789,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -25356,13 +25797,13 @@ public class MasterServer { } } - private static class getTags_resultStandardSchemeFactory implements SchemeFactory { + private static class getTags_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getTags_resultStandardScheme getScheme() { return new getTags_resultStandardScheme(); } } - private static class getTags_resultStandardScheme extends StandardScheme { + private static class getTags_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getTags_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -25377,14 +25818,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list370 = iprot.readListBegin(); - struct.success = new ArrayList(_list370.size); - MasterTag _elem371; - for (int _i372 = 0; _i372 < _list370.size; ++_i372) + org.apache.thrift.protocol.TList _list482 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list482.size); + @org.apache.thrift.annotation.Nullable MasterTag _elem483; + for (int _i484 = 0; _i484 < _list482.size; ++_i484) { - _elem371 = new MasterTag(); - _elem371.read(iprot); - struct.success.add(_elem371); + _elem483 = new MasterTag(); + _elem483.read(iprot); + struct.success.add(_elem483); } iprot.readListEnd(); } @@ -25421,9 +25862,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (MasterTag _iter373 : struct.success) + for (MasterTag _iter485 : struct.success) { - _iter373.write(oprot); + _iter485.write(oprot); } oprot.writeListEnd(); } @@ -25440,18 +25881,18 @@ public class MasterServer { } - private static class getTags_resultTupleSchemeFactory implements SchemeFactory { + private static class getTags_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getTags_resultTupleScheme getScheme() { return new getTags_resultTupleScheme(); } } - private static class getTags_resultTupleScheme extends TupleScheme { + private static class getTags_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getTags_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -25462,9 +25903,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (MasterTag _iter374 : struct.success) + for (MasterTag _iter486 : struct.success) { - _iter374.write(oprot); + _iter486.write(oprot); } } } @@ -25475,18 +25916,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getTags_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list375 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list375.size); - MasterTag _elem376; - for (int _i377 = 0; _i377 < _list375.size; ++_i377) + org.apache.thrift.protocol.TList _list487 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list487.size); + @org.apache.thrift.annotation.Nullable MasterTag _elem488; + for (int _i489 = 0; _i489 < _list487.size; ++_i489) { - _elem376 = new MasterTag(); - _elem376.read(iprot); - struct.success.add(_elem376); + _elem488 = new MasterTag(); + _elem488.read(iprot); + struct.success.add(_elem488); } } struct.setSuccessIsSet(true); @@ -25499,6 +25940,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getSoftware_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -25506,11 +25950,8 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.I64, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getSoftware_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getSoftware_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSoftware_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSoftware_argsTupleSchemeFactory(); public long startDate; // required @@ -25518,10 +25959,10 @@ public class MasterServer { public enum _Fields implements org.apache.thrift.TFieldIdEnum { START_DATE((short)1, "startDate"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -25529,6 +25970,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // START_DATE @@ -25544,21 +25986,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -25567,7 +26010,7 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -25575,12 +26018,12 @@ public class MasterServer { // isset id assignments private static final int __STARTDATE_ISSET_ID = 0; private byte __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.START_DATE, new org.apache.thrift.meta_data.FieldMetaData("startDate", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "UnixTimestamp"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSoftware_args.class, metaDataMap); } @@ -25624,57 +26067,56 @@ public class MasterServer { } public void unsetStartDate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID); } /** Returns true if field startDate is set (has been assigned a value) and false otherwise */ public boolean isSetStartDate() { - return EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID); } public void setStartDateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case START_DATE: if (value == null) { unsetStartDate(); } else { - setStartDate((Long)value); + setStartDate((java.lang.Long)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case START_DATE: return getStartDate(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case START_DATE: return isSetStartDate(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getSoftware_args) return this.equals((getSoftware_args)that); return false; @@ -25683,6 +26125,8 @@ public class MasterServer { public boolean equals(getSoftware_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_startDate = true; boolean that_present_startDate = true; @@ -25698,14 +26142,11 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_startDate = true; - list.add(present_startDate); - if (present_startDate) - list.add(startDate); + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startDate); - return list.hashCode(); + return hashCode; } @Override @@ -25716,7 +26157,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetStartDate()).compareTo(other.isSetStartDate()); + lastComparison = java.lang.Boolean.compare(isSetStartDate(), other.isSetStartDate()); if (lastComparison != 0) { return lastComparison; } @@ -25729,21 +26170,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getSoftware_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getSoftware_args("); boolean first = true; sb.append("startDate:"); @@ -25766,7 +26208,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.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; @@ -25776,13 +26218,13 @@ public class MasterServer { } } - private static class getSoftware_argsStandardSchemeFactory implements SchemeFactory { + private static class getSoftware_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getSoftware_argsStandardScheme getScheme() { return new getSoftware_argsStandardScheme(); } } - private static class getSoftware_argsStandardScheme extends StandardScheme { + private static class getSoftware_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getSoftware_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -25826,18 +26268,18 @@ public class MasterServer { } - private static class getSoftware_argsTupleSchemeFactory implements SchemeFactory { + private static class getSoftware_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getSoftware_argsTupleScheme getScheme() { return new getSoftware_argsTupleScheme(); } } - private static class getSoftware_argsTupleScheme extends TupleScheme { + private static class getSoftware_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getSoftware_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetStartDate()) { optionals.set(0); } @@ -25849,8 +26291,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getSoftware_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.startDate = iprot.readI64(); struct.setStartDateIsSet(true); @@ -25858,6 +26300,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class getSoftware_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -25866,24 +26311,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new getSoftware_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new getSoftware_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSoftware_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSoftware_resultTupleSchemeFactory(); - public List success; // required - public TInvocationException serverError; // required + public @org.apache.thrift.annotation.Nullable java.util.List success; // required + public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // 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"), SERVER_ERROR((short)1, "serverError"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -25891,6 +26333,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -25908,21 +26351,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -25931,21 +26375,21 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MasterSoftware.class)))); tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSoftware_result.class, metaDataMap); } @@ -25953,7 +26397,7 @@ public class MasterServer { } public getSoftware_result( - List success, + java.util.List success, TInvocationException serverError) { this(); @@ -25966,7 +26410,7 @@ public class MasterServer { */ public getSoftware_result(getSoftware_result other) { if (other.isSetSuccess()) { - List __this__success = new ArrayList(other.success.size()); + java.util.List __this__success = new java.util.ArrayList(other.success.size()); for (MasterSoftware other_element : other.success) { __this__success.add(new MasterSoftware(other_element)); } @@ -25991,22 +26435,24 @@ public class MasterServer { return (this.success == null) ? 0 : this.success.size(); } + @org.apache.thrift.annotation.Nullable public java.util.Iterator getSuccessIterator() { return (this.success == null) ? null : this.success.iterator(); } public void addToSuccess(MasterSoftware elem) { if (this.success == null) { - this.success = new ArrayList(); + this.success = new java.util.ArrayList(); } this.success.add(elem); } - public List getSuccess() { + @org.apache.thrift.annotation.Nullable + public java.util.List getSuccess() { return this.success; } - public getSoftware_result setSuccess(List success) { + public getSoftware_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List success) { this.success = success; return this; } @@ -26026,11 +26472,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvocationException getServerError() { return this.serverError; } - public getSoftware_result setServerError(TInvocationException serverError) { + public getSoftware_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) { this.serverError = serverError; return this; } @@ -26050,13 +26497,13 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { unsetSuccess(); } else { - setSuccess((List)value); + setSuccess((java.util.List)value); } break; @@ -26071,7 +26518,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -26080,13 +26528,13 @@ public class MasterServer { return getServerError(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -26095,13 +26543,11 @@ public class MasterServer { case SERVER_ERROR: return isSetServerError(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof getSoftware_result) return this.equals((getSoftware_result)that); return false; @@ -26110,6 +26556,8 @@ public class MasterServer { public boolean equals(getSoftware_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -26134,19 +26582,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_serverError = true && (isSetServerError()); - list.add(present_serverError); - if (present_serverError) - list.add(serverError); + hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287); + if (isSetServerError()) + hashCode = hashCode * 8191 + serverError.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -26157,7 +26603,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -26167,7 +26613,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError()); + lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError()); if (lastComparison != 0) { return lastComparison; } @@ -26180,21 +26626,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("getSoftware_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("getSoftware_result("); boolean first = true; sb.append("success:"); @@ -26229,7 +26676,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -26237,13 +26684,13 @@ public class MasterServer { } } - private static class getSoftware_resultStandardSchemeFactory implements SchemeFactory { + private static class getSoftware_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getSoftware_resultStandardScheme getScheme() { return new getSoftware_resultStandardScheme(); } } - private static class getSoftware_resultStandardScheme extends StandardScheme { + private static class getSoftware_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, getSoftware_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -26258,14 +26705,14 @@ public class MasterServer { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list378 = iprot.readListBegin(); - struct.success = new ArrayList(_list378.size); - MasterSoftware _elem379; - for (int _i380 = 0; _i380 < _list378.size; ++_i380) + org.apache.thrift.protocol.TList _list490 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list490.size); + @org.apache.thrift.annotation.Nullable MasterSoftware _elem491; + for (int _i492 = 0; _i492 < _list490.size; ++_i492) { - _elem379 = new MasterSoftware(); - _elem379.read(iprot); - struct.success.add(_elem379); + _elem491 = new MasterSoftware(); + _elem491.read(iprot); + struct.success.add(_elem491); } iprot.readListEnd(); } @@ -26302,9 +26749,9 @@ public class MasterServer { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (MasterSoftware _iter381 : struct.success) + for (MasterSoftware _iter493 : struct.success) { - _iter381.write(oprot); + _iter493.write(oprot); } oprot.writeListEnd(); } @@ -26321,18 +26768,18 @@ public class MasterServer { } - private static class getSoftware_resultTupleSchemeFactory implements SchemeFactory { + private static class getSoftware_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public getSoftware_resultTupleScheme getScheme() { return new getSoftware_resultTupleScheme(); } } - private static class getSoftware_resultTupleScheme extends TupleScheme { + private static class getSoftware_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, getSoftware_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -26343,9 +26790,9 @@ public class MasterServer { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (MasterSoftware _iter382 : struct.success) + for (MasterSoftware _iter494 : struct.success) { - _iter382.write(oprot); + _iter494.write(oprot); } } } @@ -26356,18 +26803,18 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, getSoftware_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list383 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list383.size); - MasterSoftware _elem384; - for (int _i385 = 0; _i385 < _list383.size; ++_i385) + org.apache.thrift.protocol.TList _list495 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list495.size); + @org.apache.thrift.annotation.Nullable MasterSoftware _elem496; + for (int _i497 = 0; _i497 < _list495.size; ++_i497) { - _elem384 = new MasterSoftware(); - _elem384.read(iprot); - struct.success.add(_elem384); + _elem496 = new MasterSoftware(); + _elem496.read(iprot); + struct.success.add(_elem496); } } struct.setSuccessIsSet(true); @@ -26380,6 +26827,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class queryUploadStatus_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -26387,22 +26837,19 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField UPLOAD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadToken", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new queryUploadStatus_argsStandardSchemeFactory()); - schemes.put(TupleScheme.class, new queryUploadStatus_argsTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new queryUploadStatus_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new queryUploadStatus_argsTupleSchemeFactory(); - public String uploadToken; // required + public @org.apache.thrift.annotation.Nullable java.lang.String uploadToken; // 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 { UPLOAD_TOKEN((short)1, "uploadToken"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -26410,6 +26857,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // UPLOAD_TOKEN @@ -26425,21 +26873,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -26448,18 +26897,18 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.UPLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("uploadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(queryUploadStatus_args.class, metaDataMap); } @@ -26467,7 +26916,7 @@ public class MasterServer { } public queryUploadStatus_args( - String uploadToken) + java.lang.String uploadToken) { this(); this.uploadToken = uploadToken; @@ -26491,11 +26940,12 @@ public class MasterServer { this.uploadToken = null; } - public String getUploadToken() { + @org.apache.thrift.annotation.Nullable + public java.lang.String getUploadToken() { return this.uploadToken; } - public queryUploadStatus_args setUploadToken(String uploadToken) { + public queryUploadStatus_args setUploadToken(@org.apache.thrift.annotation.Nullable java.lang.String uploadToken) { this.uploadToken = uploadToken; return this; } @@ -26515,45 +26965,44 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case UPLOAD_TOKEN: if (value == null) { unsetUploadToken(); } else { - setUploadToken((String)value); + setUploadToken((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case UPLOAD_TOKEN: return getUploadToken(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { case UPLOAD_TOKEN: return isSetUploadToken(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof queryUploadStatus_args) return this.equals((queryUploadStatus_args)that); return false; @@ -26562,6 +27011,8 @@ public class MasterServer { public boolean equals(queryUploadStatus_args that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_uploadToken = true && this.isSetUploadToken(); boolean that_present_uploadToken = true && that.isSetUploadToken(); @@ -26577,14 +27028,13 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_uploadToken = true && (isSetUploadToken()); - list.add(present_uploadToken); - if (present_uploadToken) - list.add(uploadToken); + hashCode = hashCode * 8191 + ((isSetUploadToken()) ? 131071 : 524287); + if (isSetUploadToken()) + hashCode = hashCode * 8191 + uploadToken.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -26595,7 +27045,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetUploadToken()).compareTo(other.isSetUploadToken()); + lastComparison = java.lang.Boolean.compare(isSetUploadToken(), other.isSetUploadToken()); if (lastComparison != 0) { return lastComparison; } @@ -26608,21 +27058,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("queryUploadStatus_args("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("queryUploadStatus_args("); boolean first = true; sb.append("uploadToken:"); @@ -26649,7 +27100,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -26657,13 +27108,13 @@ public class MasterServer { } } - private static class queryUploadStatus_argsStandardSchemeFactory implements SchemeFactory { + private static class queryUploadStatus_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public queryUploadStatus_argsStandardScheme getScheme() { return new queryUploadStatus_argsStandardScheme(); } } - private static class queryUploadStatus_argsStandardScheme extends StandardScheme { + private static class queryUploadStatus_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, queryUploadStatus_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -26709,18 +27160,18 @@ public class MasterServer { } - private static class queryUploadStatus_argsTupleSchemeFactory implements SchemeFactory { + private static class queryUploadStatus_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public queryUploadStatus_argsTupleScheme getScheme() { return new queryUploadStatus_argsTupleScheme(); } } - private static class queryUploadStatus_argsTupleScheme extends TupleScheme { + private static class queryUploadStatus_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_args struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetUploadToken()) { optionals.set(0); } @@ -26732,8 +27183,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_args struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { struct.uploadToken = iprot.readString(); struct.setUploadTokenIsSet(true); @@ -26741,6 +27192,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } public static class queryUploadStatus_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -26749,24 +27203,21 @@ public class MasterServer { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); private static final org.apache.thrift.protocol.TField EX1_FIELD_DESC = new org.apache.thrift.protocol.TField("ex1", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new queryUploadStatus_resultStandardSchemeFactory()); - schemes.put(TupleScheme.class, new queryUploadStatus_resultTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new queryUploadStatus_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new queryUploadStatus_resultTupleSchemeFactory(); - public TransferStatus success; // required - public TInvalidTokenException ex1; // required + public @org.apache.thrift.annotation.Nullable TransferStatus success; // required + public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex1; // 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"), EX1((short)1, "ex1"); - private static final Map byName = new HashMap(); + private static final java.util.Map byName = new java.util.HashMap(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -26774,6 +27225,7 @@ public class MasterServer { /** * Find the _Fields constant that matches fieldId, or null if its not found. */ + @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 0: // SUCCESS @@ -26791,21 +27243,22 @@ public class MasterServer { */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.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) { + @org.apache.thrift.annotation.Nullable + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -26814,20 +27267,20 @@ public class MasterServer { return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferStatus.class))); tmpMap.put(_Fields.EX1, new org.apache.thrift.meta_data.FieldMetaData("ex1", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class))); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(queryUploadStatus_result.class, metaDataMap); } @@ -26865,11 +27318,12 @@ public class MasterServer { this.ex1 = null; } + @org.apache.thrift.annotation.Nullable public TransferStatus getSuccess() { return this.success; } - public queryUploadStatus_result setSuccess(TransferStatus success) { + public queryUploadStatus_result setSuccess(@org.apache.thrift.annotation.Nullable TransferStatus success) { this.success = success; return this; } @@ -26889,11 +27343,12 @@ public class MasterServer { } } + @org.apache.thrift.annotation.Nullable public TInvalidTokenException getEx1() { return this.ex1; } - public queryUploadStatus_result setEx1(TInvalidTokenException ex1) { + public queryUploadStatus_result setEx1(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex1) { this.ex1 = ex1; return this; } @@ -26913,7 +27368,7 @@ public class MasterServer { } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { case SUCCESS: if (value == null) { @@ -26934,7 +27389,8 @@ public class MasterServer { } } - public Object getFieldValue(_Fields field) { + @org.apache.thrift.annotation.Nullable + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: return getSuccess(); @@ -26943,13 +27399,13 @@ public class MasterServer { return getEx1(); } - throw new IllegalStateException(); + throw new java.lang.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(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -26958,13 +27414,11 @@ public class MasterServer { case EX1: return isSetEx1(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { - if (that == null) - return false; + public boolean equals(java.lang.Object that) { if (that instanceof queryUploadStatus_result) return this.equals((queryUploadStatus_result)that); return false; @@ -26973,6 +27427,8 @@ public class MasterServer { public boolean equals(queryUploadStatus_result that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_success = true && this.isSetSuccess(); boolean that_present_success = true && that.isSetSuccess(); @@ -26997,19 +27453,17 @@ public class MasterServer { @Override public int hashCode() { - List list = new ArrayList(); + int hashCode = 1; - boolean present_success = true && (isSetSuccess()); - list.add(present_success); - if (present_success) - list.add(success); + hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); + if (isSetSuccess()) + hashCode = hashCode * 8191 + success.hashCode(); - boolean present_ex1 = true && (isSetEx1()); - list.add(present_ex1); - if (present_ex1) - list.add(ex1); + hashCode = hashCode * 8191 + ((isSetEx1()) ? 131071 : 524287); + if (isSetEx1()) + hashCode = hashCode * 8191 + ex1.hashCode(); - return list.hashCode(); + return hashCode; } @Override @@ -27020,7 +27474,7 @@ public class MasterServer { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -27030,7 +27484,7 @@ public class MasterServer { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEx1()).compareTo(other.isSetEx1()); + lastComparison = java.lang.Boolean.compare(isSetEx1(), other.isSetEx1()); if (lastComparison != 0) { return lastComparison; } @@ -27043,21 +27497,22 @@ public class MasterServer { return 0; } + @org.apache.thrift.annotation.Nullable 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); + scheme(iprot).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); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("queryUploadStatus_result("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("queryUploadStatus_result("); boolean first = true; sb.append("success:"); @@ -27095,7 +27550,7 @@ public class MasterServer { } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -27103,13 +27558,13 @@ public class MasterServer { } } - private static class queryUploadStatus_resultStandardSchemeFactory implements SchemeFactory { + private static class queryUploadStatus_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public queryUploadStatus_resultStandardScheme getScheme() { return new queryUploadStatus_resultStandardScheme(); } } - private static class queryUploadStatus_resultStandardScheme extends StandardScheme { + private static class queryUploadStatus_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { public void read(org.apache.thrift.protocol.TProtocol iprot, queryUploadStatus_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -27170,18 +27625,18 @@ public class MasterServer { } - private static class queryUploadStatus_resultTupleSchemeFactory implements SchemeFactory { + private static class queryUploadStatus_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public queryUploadStatus_resultTupleScheme getScheme() { return new queryUploadStatus_resultTupleScheme(); } } - private static class queryUploadStatus_resultTupleScheme extends TupleScheme { + private static class queryUploadStatus_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override public void write(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_result struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSuccess()) { optionals.set(0); } @@ -27199,8 +27654,8 @@ public class MasterServer { @Override public void read(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_result struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.success = new TransferStatus(); struct.success.read(iprot); @@ -27214,6 +27669,9 @@ public class MasterServer { } } + private static S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } } } -- cgit v1.2.3-55-g7522