diff options
| author | Simon Rettberg | 2014-10-10 18:18:03 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-10-10 18:18:03 +0200 |
| commit | 308f6ce6e0e0a4d729328513b6f367584896cebd (patch) | |
| tree | 1f9797bedd6cd60570082cd0776e867a0c442f44 | |
| parent | Adapted type of contentOperatingSystem to type in db. (diff) | |
| download | master-sync-shared-308f6ce6e0e0a4d729328513b6f367584896cebd.tar.gz master-sync-shared-308f6ce6e0e0a4d729328513b6f367584896cebd.tar.xz master-sync-shared-308f6ce6e0e0a4d729328513b6f367584896cebd.zip | |
Added ECP URL to OrganizationData, added registerOrganization()
20 files changed, 2305 insertions, 313 deletions
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java index 0c2835d..965ddd2 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java index bd4bb0b..5efc66c 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable { +public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException"); private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); @@ -303,30 +305,30 @@ public class AuthenticationException extends TException implements org.apache.th return 0; } + @Override public int compareTo(AuthenticationException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AuthenticationException typedOther = (AuthenticationException)other; - lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber()); + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); if (lastComparison != 0) { return lastComparison; } if (isSetNumber()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java index 61c5960..a49ad92 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java index fec2e3e..5f798ac 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable { +public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); @@ -303,30 +305,30 @@ public class AuthorizationException extends TException implements org.apache.thr return 0; } + @Override public int compareTo(AuthorizationException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AuthorizationException typedOther = (AuthorizationException)other; - lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber()); + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); if (lastComparison != 0) { return lastComparison; } if (isSetNumber()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java index ee95f86..e55b714 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DownloadData implements org.apache.thrift.TBase<DownloadData, DownloadData._Fields>, java.io.Serializable, Cloneable { +public class DownloadData implements org.apache.thrift.TBase<DownloadData, DownloadData._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadData"); 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); @@ -153,10 +155,7 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl } this.port = other.port; if (other.isSetCrcSums()) { - List<Integer> __this__crcSums = new ArrayList<Integer>(); - for (Integer other_element : other.crcSums) { - __this__crcSums.add(other_element); - } + List<Integer> __this__crcSums = new ArrayList<Integer>(other.crcSums); this.crcSums = __this__crcSums; } } @@ -368,40 +367,40 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl return 0; } + @Override public int compareTo(DownloadData other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - DownloadData typedOther = (DownloadData)other; - lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } if (isSetToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort()); + lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort()); if (lastComparison != 0) { return lastComparison; } if (isSetPort()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(typedOther.isSetCrcSums()); + lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(other.isSetCrcSums()); if (lastComparison != 0) { return lastComparison; } if (isSetCrcSums()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, typedOther.crcSums); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, other.crcSums); if (lastComparison != 0) { return lastComparison; } @@ -513,7 +512,7 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl struct.crcSums = new ArrayList<Integer>(_list0.size); for (int _i1 = 0; _i1 < _list0.size; ++_i1) { - int _elem2; // required + int _elem2; _elem2 = iprot.readI32(); struct.crcSums.add(_elem2); } @@ -622,7 +621,7 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl struct.crcSums = new ArrayList<Integer>(_list5.size); for (int _i6 = 0; _i6 < _list5.size; ++_i6) { - int _elem7; // required + int _elem7; _elem7 = iprot.readI32(); struct.crcSums.add(_elem7); } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java index efc2448..46404b9 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DownloadException extends TException implements org.apache.thrift.TBase<DownloadException, DownloadException._Fields>, java.io.Serializable, Cloneable { +public class DownloadException extends TException implements org.apache.thrift.TBase<DownloadException, DownloadException._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadException"); private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); @@ -303,30 +305,30 @@ public class DownloadException extends TException implements org.apache.thrift.T return 0; } + @Override public int compareTo(DownloadException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - DownloadException typedOther = (DownloadException)other; - lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber()); + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); if (lastComparison != 0) { return lastComparison; } if (isSetNumber()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java index b1c91fa..aeeb15b 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable { +public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable, Comparable<ImageData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageData"); private static final org.apache.thrift.protocol.TField UUID_FIELD_DESC = new org.apache.thrift.protocol.TField("uuid", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -820,120 +822,120 @@ public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._ return 0; } + @Override public int compareTo(ImageData other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ImageData typedOther = (ImageData)other; - lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid()); + lastComparison = Boolean.valueOf(isSetUuid()).compareTo(other.isSetUuid()); if (lastComparison != 0) { return lastComparison; } if (isSetUuid()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRevision()).compareTo(typedOther.isSetRevision()); + lastComparison = Boolean.valueOf(isSetRevision()).compareTo(other.isSetRevision()); if (lastComparison != 0) { return lastComparison; } if (isSetRevision()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.revision, typedOther.revision); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.revision, other.revision); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTitle()).compareTo(typedOther.isSetTitle()); + lastComparison = Boolean.valueOf(isSetTitle()).compareTo(other.isSetTitle()); if (lastComparison != 0) { return lastComparison; } if (isSetTitle()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.title, typedOther.title); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.title, other.title); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(typedOther.isSetCreateTime()); + lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime()); if (lastComparison != 0) { return lastComparison; } if (isSetCreateTime()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, typedOther.createTime); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, other.createTime); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(typedOther.isSetUpdateTime()); + lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(other.isSetUpdateTime()); if (lastComparison != 0) { return lastComparison; } if (isSetUpdateTime()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updateTime, typedOther.updateTime); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updateTime, other.updateTime); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOwnerLogin()).compareTo(typedOther.isSetOwnerLogin()); + lastComparison = Boolean.valueOf(isSetOwnerLogin()).compareTo(other.isSetOwnerLogin()); if (lastComparison != 0) { return lastComparison; } if (isSetOwnerLogin()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerLogin, typedOther.ownerLogin); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerLogin, other.ownerLogin); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOperatingSystem()).compareTo(typedOther.isSetOperatingSystem()); + lastComparison = Boolean.valueOf(isSetOperatingSystem()).compareTo(other.isSetOperatingSystem()); if (lastComparison != 0) { return lastComparison; } if (isSetOperatingSystem()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatingSystem, typedOther.operatingSystem); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatingSystem, other.operatingSystem); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIsValid()).compareTo(typedOther.isSetIsValid()); + lastComparison = Boolean.valueOf(isSetIsValid()).compareTo(other.isSetIsValid()); if (lastComparison != 0) { return lastComparison; } if (isSetIsValid()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isValid, typedOther.isValid); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isValid, other.isValid); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIsDeleted()).compareTo(typedOther.isSetIsDeleted()); + lastComparison = Boolean.valueOf(isSetIsDeleted()).compareTo(other.isSetIsDeleted()); if (lastComparison != 0) { return lastComparison; } if (isSetIsDeleted()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDeleted, typedOther.isDeleted); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDeleted, other.isDeleted); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDescription()).compareTo(typedOther.isSetDescription()); + lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription()); if (lastComparison != 0) { return lastComparison; } if (isSetDescription()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, typedOther.description); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(typedOther.isSetFileSize()); + lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize()); if (lastComparison != 0) { return lastComparison; } if (isSetFileSize()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, typedOther.fileSize); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, other.fileSize); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java index c9e52ae..fdd7b81 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java index dbf28cd..a5ac923 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable { +public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDataException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDataException"); private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); @@ -303,30 +305,30 @@ public class ImageDataException extends TException implements org.apache.thrift. return 0; } + @Override public int compareTo(ImageDataException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ImageDataException typedOther = (ImageDataException)other; - lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber()); + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); if (lastComparison != 0) { return lastComparison; } if (isSetNumber()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java index 227bd84..7580625 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -58,33 +60,37 @@ public class ImageServer { public boolean publishUser(String serverSessionId, UserInfo user) throws AuthorizationException, org.apache.thrift.TException; + public boolean registerSatellite(String organizationId, String address, String modulus, String exponent) throws org.apache.thrift.TException; + } public interface AsyncIface { - public void ping(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.ping_call> 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(String login, String password, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.authenticate_call> 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<AsyncClient.getOrganizations_call> 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(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.findUser_call> 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(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getPublicImages_call> 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(String token, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getUserFromToken_call> 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(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.isServerAuthenticated_call> resultHandler) throws org.apache.thrift.TException; + public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.startServerAuthentication_call> resultHandler) throws org.apache.thrift.TException; + public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.serverAuthenticate_call> resultHandler) throws org.apache.thrift.TException; + public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitImage_call> resultHandler) throws org.apache.thrift.TException; + public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getImage_call> resultHandler) throws org.apache.thrift.TException; + public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.publishUser_call> resultHandler) throws org.apache.thrift.TException; + public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -427,6 +433,32 @@ public class ImageServer { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "publishUser failed: unknown result"); } + public boolean registerSatellite(String organizationId, String address, String modulus, String exponent) throws org.apache.thrift.TException + { + send_registerSatellite(organizationId, address, modulus, exponent); + return recv_registerSatellite(); + } + + public void send_registerSatellite(String organizationId, String address, String modulus, String exponent) throws org.apache.thrift.TException + { + registerSatellite_args args = new registerSatellite_args(); + args.setOrganizationId(organizationId); + args.setAddress(address); + args.setModulus(modulus); + args.setExponent(exponent); + sendBase("registerSatellite", args); + } + + public boolean recv_registerSatellite() throws org.apache.thrift.TException + { + registerSatellite_result result = new registerSatellite_result(); + receiveBase(result, "registerSatellite"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerSatellite failed: unknown result"); + } + } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> { @@ -445,7 +477,7 @@ public class ImageServer { super(protocolFactory, clientManager, transport); } - public void ping(org.apache.thrift.async.AsyncMethodCallback<ping_call> 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; @@ -453,7 +485,7 @@ public class ImageServer { } public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall { - public ping_call(org.apache.thrift.async.AsyncMethodCallback<ping_call> 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 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); } @@ -474,7 +506,7 @@ public class ImageServer { } } - public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback<authenticate_call> resultHandler) throws org.apache.thrift.TException { + public void authenticate(String login, 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; @@ -484,7 +516,7 @@ public class ImageServer { 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<authenticate_call> 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 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 { super(client, protocolFactory, transport, resultHandler, false); this.login = login; this.password = password; @@ -509,7 +541,7 @@ public class ImageServer { } } - public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback<getOrganizations_call> 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; @@ -517,7 +549,7 @@ public class ImageServer { } public static class getOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall { - public getOrganizations_call(org.apache.thrift.async.AsyncMethodCallback<getOrganizations_call> 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 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); } @@ -538,7 +570,7 @@ public class ImageServer { } } - public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback<findUser_call> 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 { checkReady(); findUser_call method_call = new findUser_call(sessionId, organizationId, searchTerm, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -549,7 +581,7 @@ public class ImageServer { private String sessionId; private String organizationId; private String searchTerm; - public findUser_call(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback<findUser_call> 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 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 { super(client, protocolFactory, transport, resultHandler, false); this.sessionId = sessionId; this.organizationId = organizationId; @@ -576,7 +608,7 @@ public class ImageServer { } } - public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<getPublicImages_call> resultHandler) throws org.apache.thrift.TException { + public void getPublicImages(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; @@ -586,7 +618,7 @@ public class ImageServer { public static class getPublicImages_call extends org.apache.thrift.async.TAsyncMethodCall { private String sessionId; private int page; - public getPublicImages_call(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<getPublicImages_call> 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(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; @@ -611,7 +643,7 @@ public class ImageServer { } } - public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> resultHandler) throws org.apache.thrift.TException { + public void getUserFromToken(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; @@ -620,7 +652,7 @@ public class ImageServer { public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall { private String token; - public getUserFromToken_call(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> 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 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 { super(client, protocolFactory, transport, resultHandler, false); this.token = token; } @@ -643,7 +675,7 @@ public class ImageServer { } } - public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> resultHandler) throws org.apache.thrift.TException { + public void isServerAuthenticated(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; @@ -652,7 +684,7 @@ public class ImageServer { public static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall { private String serverSessionId; - public isServerAuthenticated_call(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> 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 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 { super(client, protocolFactory, transport, resultHandler, false); this.serverSessionId = serverSessionId; } @@ -675,7 +707,7 @@ public class ImageServer { } } - public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> resultHandler) throws org.apache.thrift.TException { + public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); startServerAuthentication_call method_call = new startServerAuthentication_call(organization, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -684,7 +716,7 @@ public class ImageServer { public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall { private String organization; - public startServerAuthentication_call(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> 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(String organization, 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.organization = organization; } @@ -707,7 +739,7 @@ public class ImageServer { } } - public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> resultHandler) throws org.apache.thrift.TException { + public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); serverAuthenticate_call method_call = new serverAuthenticate_call(organizationId, challengeResponse, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -717,7 +749,7 @@ public class ImageServer { public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall { private String organizationId; private ByteBuffer challengeResponse; - public serverAuthenticate_call(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> 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 serverAuthenticate_call(String organizationId, 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.organizationId = organizationId; this.challengeResponse = challengeResponse; @@ -742,7 +774,7 @@ public class ImageServer { } } - public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<submitImage_call> resultHandler) throws org.apache.thrift.TException { + public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); submitImage_call method_call = new submitImage_call(serverSessionId, imageDescription, crcSums, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -753,7 +785,7 @@ public class ImageServer { private String serverSessionId; private ImageData imageDescription; private List<Integer> crcSums; - public submitImage_call(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<submitImage_call> 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 submitImage_call(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, 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.imageDescription = imageDescription; @@ -780,7 +812,7 @@ public class ImageServer { } } - public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback<getImage_call> resultHandler) throws org.apache.thrift.TException { + public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); getImage_call method_call = new getImage_call(serverSessionId, uuid, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -790,7 +822,7 @@ public class ImageServer { public static class getImage_call extends org.apache.thrift.async.TAsyncMethodCall { private String serverSessionId; private String uuid; - public getImage_call(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback<getImage_call> 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 getImage_call(String serverSessionId, String uuid, 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.uuid = uuid; @@ -815,7 +847,7 @@ public class ImageServer { } } - public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback<publishUser_call> resultHandler) throws org.apache.thrift.TException { + public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); publishUser_call method_call = new publishUser_call(serverSessionId, user, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; @@ -825,7 +857,7 @@ public class ImageServer { public static class publishUser_call extends org.apache.thrift.async.TAsyncMethodCall { private String serverSessionId; private UserInfo user; - public publishUser_call(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback<publishUser_call> 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 publishUser_call(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.serverSessionId = serverSessionId; this.user = user; @@ -850,6 +882,47 @@ public class ImageServer { } } + public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + registerSatellite_call method_call = new registerSatellite_call(organizationId, address, modulus, exponent, 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 organizationId; + private String address; + private String modulus; + private String exponent; + public registerSatellite_call(String organizationId, String address, String modulus, String exponent, 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.organizationId = organizationId; + this.address = address; + this.modulus = modulus; + this.exponent = exponent; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("registerSatellite", org.apache.thrift.protocol.TMessageType.CALL, 0)); + registerSatellite_args args = new registerSatellite_args(); + args.setOrganizationId(organizationId); + args.setAddress(address); + args.setModulus(modulus); + args.setExponent(exponent); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_registerSatellite(); + } + } + } public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor { @@ -875,6 +948,7 @@ public class ImageServer { processMap.put("submitImage", new submitImage()); processMap.put("getImage", new getImage()); processMap.put("publishUser", new publishUser()); + processMap.put("registerSatellite", new registerSatellite()); return processMap; } @@ -1163,9 +1237,795 @@ public class ImageServer { } } + public static class registerSatellite<I extends Iface> extends org.apache.thrift.ProcessFunction<I, registerSatellite_args> { + public registerSatellite() { + super("registerSatellite"); + } + + public registerSatellite_args getEmptyArgsInstance() { + return new registerSatellite_args(); + } + + protected boolean isOneway() { + return false; + } + + public registerSatellite_result getResult(I iface, registerSatellite_args args) throws org.apache.thrift.TException { + registerSatellite_result result = new registerSatellite_result(); + result.success = iface.registerSatellite(args.organizationId, args.address, args.modulus, args.exponent); + result.setSuccessIsSet(true); + return result; + } + } + } - public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable { + public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> { + private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); + public AsyncProcessor(I iface) { + super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>())); + } + + protected AsyncProcessor(I iface, Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { + super(iface, getProcessMap(processMap)); + } + + private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) { + processMap.put("ping", new ping()); + processMap.put("authenticate", new authenticate()); + processMap.put("getOrganizations", new getOrganizations()); + processMap.put("findUser", new findUser()); + processMap.put("getPublicImages", new getPublicImages()); + processMap.put("getUserFromToken", new getUserFromToken()); + processMap.put("isServerAuthenticated", new isServerAuthenticated()); + processMap.put("startServerAuthentication", new startServerAuthentication()); + processMap.put("serverAuthenticate", new serverAuthenticate()); + processMap.put("submitImage", new submitImage()); + processMap.put("getImage", new getImage()); + processMap.put("publishUser", new publishUser()); + processMap.put("registerSatellite", new registerSatellite()); + return processMap; + } + + public static class ping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, ping_args, Boolean> { + public ping() { + super("ping"); + } + + public ping_args getEmptyArgsInstance() { + return new ping_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + ping_result result = new ping_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.ping(resultHandler); + } + } + + public static class authenticate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, authenticate_args, SessionData> { + public authenticate() { + super("authenticate"); + } + + public authenticate_args getEmptyArgsInstance() { + return new authenticate_args(); + } + + public AsyncMethodCallback<SessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<SessionData>() { + 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + authenticate_result result = new authenticate_result(); + if (e instanceof AuthenticationException) { + result.failure = (AuthenticationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler) throws TException { + iface.authenticate(args.login, args.password,resultHandler); + } + } + + public static class getOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOrganizations_args, List<OrganizationData>> { + public getOrganizations() { + super("getOrganizations"); + } + + public getOrganizations_args getEmptyArgsInstance() { + return new getOrganizations_args(); + } + + public AsyncMethodCallback<List<OrganizationData>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<List<OrganizationData>>() { + public void onComplete(List<OrganizationData> 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getOrganizations_result result = new getOrganizations_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback<List<OrganizationData>> resultHandler) throws TException { + iface.getOrganizations(resultHandler); + } + } + + public static class findUser<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, findUser_args, List<UserInfo>> { + public findUser() { + super("findUser"); + } + + public findUser_args getEmptyArgsInstance() { + return new findUser_args(); + } + + public AsyncMethodCallback<List<UserInfo>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<List<UserInfo>>() { + public void onComplete(List<UserInfo> 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + findUser_result result = new findUser_result(); + if (e instanceof AuthorizationException) { + result.failure = (AuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, findUser_args args, org.apache.thrift.async.AsyncMethodCallback<List<UserInfo>> resultHandler) throws TException { + iface.findUser(args.sessionId, args.organizationId, args.searchTerm,resultHandler); + } + } + + public static class getPublicImages<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getPublicImages_args, List<ImageData>> { + public getPublicImages() { + super("getPublicImages"); + } + + public getPublicImages_args getEmptyArgsInstance() { + return new getPublicImages_args(); + } + + public AsyncMethodCallback<List<ImageData>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<List<ImageData>>() { + public void onComplete(List<ImageData> 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getPublicImages_result result = new getPublicImages_result(); + if (e instanceof AuthorizationException) { + result.failure = (AuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getPublicImages_args args, org.apache.thrift.async.AsyncMethodCallback<List<ImageData>> resultHandler) throws TException { + iface.getPublicImages(args.sessionId, args.page,resultHandler); + } + } + + public static class getUserFromToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserFromToken_args, UserInfo> { + public getUserFromToken() { + super("getUserFromToken"); + } + + public getUserFromToken_args getEmptyArgsInstance() { + return new getUserFromToken_args(); + } + + public AsyncMethodCallback<UserInfo> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<UserInfo>() { + 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getUserFromToken_result result = new getUserFromToken_result(); + if (e instanceof InvalidTokenException) { + result.failure = (InvalidTokenException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws TException { + iface.getUserFromToken(args.token,resultHandler); + } + } + + public static class isServerAuthenticated<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isServerAuthenticated_args, Boolean> { + public isServerAuthenticated() { + super("isServerAuthenticated"); + } + + public isServerAuthenticated_args getEmptyArgsInstance() { + return new isServerAuthenticated_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + isServerAuthenticated_result result = new isServerAuthenticated_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, isServerAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.isServerAuthenticated(args.serverSessionId,resultHandler); + } + } + + public static class startServerAuthentication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startServerAuthentication_args, ByteBuffer> { + public startServerAuthentication() { + super("startServerAuthentication"); + } + + public startServerAuthentication_args getEmptyArgsInstance() { + return new startServerAuthentication_args(); + } + + public AsyncMethodCallback<ByteBuffer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<ByteBuffer>() { + public void onComplete(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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + startServerAuthentication_result result = new startServerAuthentication_result(); + if (e instanceof AuthenticationException) { + result.failure = (AuthenticationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback<ByteBuffer> resultHandler) throws TException { + iface.startServerAuthentication(args.organization,resultHandler); + } + } + + public static class serverAuthenticate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, serverAuthenticate_args, ServerSessionData> { + public serverAuthenticate() { + super("serverAuthenticate"); + } + + public serverAuthenticate_args getEmptyArgsInstance() { + return new serverAuthenticate_args(); + } + + public AsyncMethodCallback<ServerSessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<ServerSessionData>() { + 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + serverAuthenticate_result result = new serverAuthenticate_result(); + if (e instanceof AuthenticationException) { + result.failure = (AuthenticationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws TException { + iface.serverAuthenticate(args.organizationId, args.challengeResponse,resultHandler); + } + } + + public static class submitImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitImage_args, UploadData> { + public submitImage() { + super("submitImage"); + } + + public submitImage_args getEmptyArgsInstance() { + return new submitImage_args(); + } + + public AsyncMethodCallback<UploadData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<UploadData>() { + public void onComplete(UploadData 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + submitImage_result result = new submitImage_result(); + if (e instanceof AuthorizationException) { + result.failure = (AuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } + else if (e instanceof ImageDataException) { + result.failure2 = (ImageDataException) e; + result.setFailure2IsSet(true); + msg = result; + } + else if (e instanceof UploadException) { + result.failure3 = (UploadException) e; + result.setFailure3IsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback<UploadData> resultHandler) throws TException { + iface.submitImage(args.serverSessionId, args.imageDescription, args.crcSums,resultHandler); + } + } + + public static class getImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImage_args, DownloadData> { + public getImage() { + super("getImage"); + } + + public getImage_args getEmptyArgsInstance() { + return new getImage_args(); + } + + public AsyncMethodCallback<DownloadData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<DownloadData>() { + public void onComplete(DownloadData o) { + getImage_result result = new getImage_result(); + result.success = o; + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getImage_result result = new getImage_result(); + if (e instanceof AuthorizationException) { + result.failure = (AuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } + else if (e instanceof ImageDataException) { + result.failure2 = (ImageDataException) e; + result.setFailure2IsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getImage_args args, org.apache.thrift.async.AsyncMethodCallback<DownloadData> resultHandler) throws TException { + iface.getImage(args.serverSessionId, args.uuid,resultHandler); + } + } + + public static class publishUser<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, publishUser_args, Boolean> { + public publishUser() { + super("publishUser"); + } + + public publishUser_args getEmptyArgsInstance() { + return new publishUser_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + publishUser_result result = new publishUser_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + publishUser_result result = new publishUser_result(); + if (e instanceof AuthorizationException) { + result.failure = (AuthorizationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, publishUser_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.publishUser(args.serverSessionId, args.user,resultHandler); + } + } + + public static class registerSatellite<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerSatellite_args, Boolean> { + public registerSatellite() { + super("registerSatellite"); + } + + public registerSatellite_args getEmptyArgsInstance() { + return new registerSatellite_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + 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); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + registerSatellite_result result = new registerSatellite_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, registerSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.registerSatellite(args.organizationId, args.address, args.modulus, args.exponent,resultHandler); + } + } + + } + + public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable, Comparable<ping_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args"); @@ -1298,13 +2158,13 @@ public class ImageServer { return 0; } + @Override public int compareTo(ping_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ping_args typedOther = (ping_args)other; return 0; } @@ -1411,7 +2271,7 @@ public class ImageServer { } - public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable { + public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable, Comparable<ping_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_result"); private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); @@ -1611,20 +2471,20 @@ public class ImageServer { return 0; } + @Override public int compareTo(ping_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ping_result typedOther = (ping_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -1765,7 +2625,7 @@ public class ImageServer { } - public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable { + public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_args"); private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -2022,30 +2882,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(authenticate_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - authenticate_args typedOther = (authenticate_args)other; - lastComparison = Boolean.valueOf(isSetLogin()).compareTo(typedOther.isSetLogin()); + lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); if (lastComparison != 0) { return lastComparison; } if (isSetLogin()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, typedOther.login); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword()); + lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword()); if (lastComparison != 0) { return lastComparison; } if (isSetPassword()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password); if (lastComparison != 0) { return lastComparison; } @@ -2219,7 +3079,7 @@ public class ImageServer { } - public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable { + public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_result"); 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); @@ -2476,30 +3336,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(authenticate_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - authenticate_result typedOther = (authenticate_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -2680,7 +3540,7 @@ public class ImageServer { } - public static class getOrganizations_args implements org.apache.thrift.TBase<getOrganizations_args, getOrganizations_args._Fields>, java.io.Serializable, Cloneable { + public static class getOrganizations_args implements org.apache.thrift.TBase<getOrganizations_args, getOrganizations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_args"); @@ -2813,13 +3673,13 @@ public class ImageServer { return 0; } + @Override public int compareTo(getOrganizations_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getOrganizations_args typedOther = (getOrganizations_args)other; return 0; } @@ -2926,7 +3786,7 @@ public class ImageServer { } - public static class getOrganizations_result implements org.apache.thrift.TBase<getOrganizations_result, getOrganizations_result._Fields>, java.io.Serializable, Cloneable { + public static class getOrganizations_result implements org.apache.thrift.TBase<getOrganizations_result, getOrganizations_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_result"); 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); @@ -3023,7 +3883,7 @@ public class ImageServer { */ public getOrganizations_result(getOrganizations_result other) { if (other.isSetSuccess()) { - List<OrganizationData> __this__success = new ArrayList<OrganizationData>(); + List<OrganizationData> __this__success = new ArrayList<OrganizationData>(other.success.size()); for (OrganizationData other_element : other.success) { __this__success.add(new OrganizationData(other_element)); } @@ -3144,20 +4004,20 @@ public class ImageServer { return 0; } + @Override public int compareTo(getOrganizations_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getOrganizations_result typedOther = (getOrganizations_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -3239,7 +4099,7 @@ public class ImageServer { struct.success = new ArrayList<OrganizationData>(_list8.size); for (int _i9 = 0; _i9 < _list8.size; ++_i9) { - OrganizationData _elem10; // required + OrganizationData _elem10; _elem10 = new OrganizationData(); _elem10.read(iprot); struct.success.add(_elem10); @@ -3321,7 +4181,7 @@ public class ImageServer { struct.success = new ArrayList<OrganizationData>(_list13.size); for (int _i14 = 0; _i14 < _list13.size; ++_i14) { - OrganizationData _elem15; // required + OrganizationData _elem15; _elem15 = new OrganizationData(); _elem15.read(iprot); struct.success.add(_elem15); @@ -3334,7 +4194,7 @@ public class ImageServer { } - public static class findUser_args implements org.apache.thrift.TBase<findUser_args, findUser_args._Fields>, java.io.Serializable, Cloneable { + public static class findUser_args implements org.apache.thrift.TBase<findUser_args, findUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<findUser_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("findUser_args"); 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); @@ -3650,40 +4510,40 @@ public class ImageServer { return 0; } + @Override public int compareTo(findUser_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - findUser_args typedOther = (findUser_args)other; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId()); + lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId()); + lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId()); if (lastComparison != 0) { return lastComparison; } if (isSetOrganizationId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSearchTerm()).compareTo(typedOther.isSetSearchTerm()); + lastComparison = Boolean.valueOf(isSetSearchTerm()).compareTo(other.isSetSearchTerm()); if (lastComparison != 0) { return lastComparison; } if (isSetSearchTerm()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.searchTerm, typedOther.searchTerm); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.searchTerm, other.searchTerm); if (lastComparison != 0) { return lastComparison; } @@ -3888,7 +4748,7 @@ public class ImageServer { } - public static class findUser_result implements org.apache.thrift.TBase<findUser_result, findUser_result._Fields>, java.io.Serializable, Cloneable { + public static class findUser_result implements org.apache.thrift.TBase<findUser_result, findUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<findUser_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("findUser_result"); 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); @@ -3994,7 +4854,7 @@ public class ImageServer { */ public findUser_result(findUser_result other) { if (other.isSetSuccess()) { - List<UserInfo> __this__success = new ArrayList<UserInfo>(); + List<UserInfo> __this__success = new ArrayList<UserInfo>(other.success.size()); for (UserInfo other_element : other.success) { __this__success.add(new UserInfo(other_element)); } @@ -4165,30 +5025,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(findUser_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - findUser_result typedOther = (findUser_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -4278,7 +5138,7 @@ public class ImageServer { struct.success = new ArrayList<UserInfo>(_list16.size); for (int _i17 = 0; _i17 < _list16.size; ++_i17) { - UserInfo _elem18; // required + UserInfo _elem18; _elem18 = new UserInfo(); _elem18.read(iprot); struct.success.add(_elem18); @@ -4380,7 +5240,7 @@ public class ImageServer { struct.success = new ArrayList<UserInfo>(_list21.size); for (int _i22 = 0; _i22 < _list21.size; ++_i22) { - UserInfo _elem23; // required + UserInfo _elem23; _elem23 = new UserInfo(); _elem23.read(iprot); struct.success.add(_elem23); @@ -4398,7 +5258,7 @@ public class ImageServer { } - public static class getPublicImages_args implements org.apache.thrift.TBase<getPublicImages_args, getPublicImages_args._Fields>, java.io.Serializable, Cloneable { + public static class getPublicImages_args implements org.apache.thrift.TBase<getPublicImages_args, getPublicImages_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPublicImages_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPublicImages_args"); 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); @@ -4657,30 +5517,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(getPublicImages_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getPublicImages_args typedOther = (getPublicImages_args)other; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId()); + lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPage()).compareTo(typedOther.isSetPage()); + lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage()); if (lastComparison != 0) { return lastComparison; } if (isSetPage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.page, typedOther.page); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.page, other.page); if (lastComparison != 0) { return lastComparison; } @@ -4850,7 +5710,7 @@ public class ImageServer { } - public static class getPublicImages_result implements org.apache.thrift.TBase<getPublicImages_result, getPublicImages_result._Fields>, java.io.Serializable, Cloneable { + public static class getPublicImages_result implements org.apache.thrift.TBase<getPublicImages_result, getPublicImages_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPublicImages_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPublicImages_result"); 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); @@ -4956,7 +5816,7 @@ public class ImageServer { */ public getPublicImages_result(getPublicImages_result other) { if (other.isSetSuccess()) { - List<ImageData> __this__success = new ArrayList<ImageData>(); + List<ImageData> __this__success = new ArrayList<ImageData>(other.success.size()); for (ImageData other_element : other.success) { __this__success.add(new ImageData(other_element)); } @@ -5127,30 +5987,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(getPublicImages_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getPublicImages_result typedOther = (getPublicImages_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -5240,7 +6100,7 @@ public class ImageServer { struct.success = new ArrayList<ImageData>(_list24.size); for (int _i25 = 0; _i25 < _list24.size; ++_i25) { - ImageData _elem26; // required + ImageData _elem26; _elem26 = new ImageData(); _elem26.read(iprot); struct.success.add(_elem26); @@ -5342,7 +6202,7 @@ public class ImageServer { struct.success = new ArrayList<ImageData>(_list29.size); for (int _i30 = 0; _i30 < _list29.size; ++_i30) { - ImageData _elem31; // required + ImageData _elem31; _elem31 = new ImageData(); _elem31.read(iprot); struct.success.add(_elem31); @@ -5360,7 +6220,7 @@ public class ImageServer { } - public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable { + public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_args"); private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -5558,20 +6418,20 @@ public class ImageServer { return 0; } + @Override public int compareTo(getUserFromToken_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getUserFromToken_args typedOther = (getUserFromToken_args)other; - lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } if (isSetToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } @@ -5714,7 +6574,7 @@ public class ImageServer { } - public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable { + public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_result"); 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); @@ -5971,30 +6831,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(getUserFromToken_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getUserFromToken_result typedOther = (getUserFromToken_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -6175,7 +7035,7 @@ public class ImageServer { } - public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable { + public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isServerAuthenticated_args"); 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); @@ -6373,20 +7233,20 @@ public class ImageServer { return 0; } + @Override public int compareTo(isServerAuthenticated_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - isServerAuthenticated_args typedOther = (isServerAuthenticated_args)other; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId()); + lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetServerSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId); if (lastComparison != 0) { return lastComparison; } @@ -6529,7 +7389,7 @@ public class ImageServer { } - public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable { + public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isServerAuthenticated_result"); private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); @@ -6729,20 +7589,20 @@ public class ImageServer { return 0; } + @Override public int compareTo(isServerAuthenticated_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - isServerAuthenticated_result typedOther = (isServerAuthenticated_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } @@ -6883,7 +7743,7 @@ public class ImageServer { } - public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable { + public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startServerAuthentication_args"); private static final org.apache.thrift.protocol.TField ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("organization", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -7081,20 +7941,20 @@ public class ImageServer { return 0; } + @Override public int compareTo(startServerAuthentication_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - startServerAuthentication_args typedOther = (startServerAuthentication_args)other; - lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(typedOther.isSetOrganization()); + lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(other.isSetOrganization()); if (lastComparison != 0) { return lastComparison; } if (isSetOrganization()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, typedOther.organization); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, other.organization); if (lastComparison != 0) { return lastComparison; } @@ -7237,7 +8097,7 @@ public class ImageServer { } - public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable { + public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startServerAuthentication_result"); private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0); @@ -7505,30 +8365,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(startServerAuthentication_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - startServerAuthentication_result typedOther = (startServerAuthentication_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -7704,7 +8564,7 @@ public class ImageServer { } - public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable { + public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("serverAuthenticate_args"); 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)1); @@ -7972,30 +8832,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(serverAuthenticate_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - serverAuthenticate_args typedOther = (serverAuthenticate_args)other; - lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId()); + lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId()); if (lastComparison != 0) { return lastComparison; } if (isSetOrganizationId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(typedOther.isSetChallengeResponse()); + lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(other.isSetChallengeResponse()); if (lastComparison != 0) { return lastComparison; } if (isSetChallengeResponse()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, typedOther.challengeResponse); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, other.challengeResponse); if (lastComparison != 0) { return lastComparison; } @@ -8169,7 +9029,7 @@ public class ImageServer { } - public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable { + public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("serverAuthenticate_result"); 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); @@ -8426,30 +9286,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(serverAuthenticate_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - serverAuthenticate_result typedOther = (serverAuthenticate_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -8630,7 +9490,7 @@ public class ImageServer { } - public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable { + public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_args"); 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); @@ -8751,10 +9611,7 @@ public class ImageServer { this.imageDescription = new ImageData(other.imageDescription); } if (other.isSetCrcSums()) { - List<Integer> __this__crcSums = new ArrayList<Integer>(); - for (Integer other_element : other.crcSums) { - __this__crcSums.add(other_element); - } + List<Integer> __this__crcSums = new ArrayList<Integer>(other.crcSums); this.crcSums = __this__crcSums; } } @@ -8966,40 +9823,40 @@ public class ImageServer { return 0; } + @Override public int compareTo(submitImage_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - submitImage_args typedOther = (submitImage_args)other; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId()); + lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetServerSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(typedOther.isSetImageDescription()); + lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription()); if (lastComparison != 0) { return lastComparison; } if (isSetImageDescription()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, typedOther.imageDescription); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, other.imageDescription); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(typedOther.isSetCrcSums()); + lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(other.isSetCrcSums()); if (lastComparison != 0) { return lastComparison; } if (isSetCrcSums()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, typedOther.crcSums); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, other.crcSums); if (lastComparison != 0) { return lastComparison; } @@ -9117,7 +9974,7 @@ public class ImageServer { struct.crcSums = new ArrayList<Integer>(_list32.size); for (int _i33 = 0; _i33 < _list32.size; ++_i33) { - int _elem34; // required + int _elem34; _elem34 = iprot.readI32(); struct.crcSums.add(_elem34); } @@ -9229,7 +10086,7 @@ public class ImageServer { struct.crcSums = new ArrayList<Integer>(_list37.size); for (int _i38 = 0; _i38 < _list37.size; ++_i38) { - int _elem39; // required + int _elem39; _elem39 = iprot.readI32(); struct.crcSums.add(_elem39); } @@ -9241,7 +10098,7 @@ public class ImageServer { } - public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable { + public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_result"); 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); @@ -9616,50 +10473,50 @@ public class ImageServer { return 0; } + @Override public int compareTo(submitImage_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - submitImage_result typedOther = (submitImage_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2()); + lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure2()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(typedOther.isSetFailure3()); + lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure3()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, typedOther.failure3); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, other.failure3); if (lastComparison != 0) { return lastComparison; } @@ -9906,7 +10763,7 @@ public class ImageServer { } - public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable { + public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_args"); 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)2); @@ -10163,30 +11020,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(getImage_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getImage_args typedOther = (getImage_args)other; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId()); + lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetServerSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid()); + lastComparison = Boolean.valueOf(isSetUuid()).compareTo(other.isSetUuid()); if (lastComparison != 0) { return lastComparison; } if (isSetUuid()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid); if (lastComparison != 0) { return lastComparison; } @@ -10360,7 +11217,7 @@ public class ImageServer { } - public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable { + public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_result"); 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); @@ -10676,40 +11533,40 @@ public class ImageServer { return 0; } + @Override public int compareTo(getImage_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - getImage_result typedOther = (getImage_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2()); + lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure2()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2); if (lastComparison != 0) { return lastComparison; } @@ -10923,7 +11780,7 @@ public class ImageServer { } - public static class publishUser_args implements org.apache.thrift.TBase<publishUser_args, publishUser_args._Fields>, java.io.Serializable, Cloneable { + public static class publishUser_args implements org.apache.thrift.TBase<publishUser_args, publishUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<publishUser_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("publishUser_args"); 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); @@ -11180,30 +12037,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(publishUser_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - publishUser_args typedOther = (publishUser_args)other; - lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId()); + lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetServerSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUser()).compareTo(typedOther.isSetUser()); + lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); if (lastComparison != 0) { return lastComparison; } if (isSetUser()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, typedOther.user); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); if (lastComparison != 0) { return lastComparison; } @@ -11382,7 +12239,7 @@ public class ImageServer { } - public static class publishUser_result implements org.apache.thrift.TBase<publishUser_result, publishUser_result._Fields>, java.io.Serializable, Cloneable { + public static class publishUser_result implements org.apache.thrift.TBase<publishUser_result, publishUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<publishUser_result> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("publishUser_result"); private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); @@ -11641,30 +12498,30 @@ public class ImageServer { return 0; } + @Override public int compareTo(publishUser_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - publishUser_result typedOther = (publishUser_result)other; - lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess()); + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure()); + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); if (lastComparison != 0) { return lastComparison; } if (isSetFailure()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); if (lastComparison != 0) { return lastComparison; } @@ -11838,4 +12695,1012 @@ public class ImageServer { } + public static class registerSatellite_args implements org.apache.thrift.TBase<registerSatellite_args, registerSatellite_args._Fields>, java.io.Serializable, Cloneable, Comparable<registerSatellite_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerSatellite_args"); + + 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)1); + private static final org.apache.thrift.protocol.TField ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("address", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField MODULUS_FIELD_DESC = new org.apache.thrift.protocol.TField("modulus", org.apache.thrift.protocol.TType.STRING, (short)3); + 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new registerSatellite_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new registerSatellite_argsTupleSchemeFactory()); + } + + public String organizationId; // required + public String address; // required + public String modulus; // required + public String exponent; // 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 { + ORGANIZATION_ID((short)1, "organizationId"), + ADDRESS((short)2, "address"), + MODULUS((short)3, "modulus"), + EXPONENT((short)4, "exponent"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // ORGANIZATION_ID + return ORGANIZATION_ID; + case 2: // ADDRESS + return ADDRESS; + case 3: // MODULUS + return MODULUS; + case 4: // EXPONENT + return EXPONENT; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.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.ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("address", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.MODULUS, new org.apache.thrift.meta_data.FieldMetaData("modulus", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.EXPONENT, new org.apache.thrift.meta_data.FieldMetaData("exponent", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerSatellite_args.class, metaDataMap); + } + + public registerSatellite_args() { + } + + public registerSatellite_args( + String organizationId, + String address, + String modulus, + String exponent) + { + this(); + this.organizationId = organizationId; + this.address = address; + this.modulus = modulus; + this.exponent = exponent; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public registerSatellite_args(registerSatellite_args other) { + if (other.isSetOrganizationId()) { + this.organizationId = other.organizationId; + } + if (other.isSetAddress()) { + this.address = other.address; + } + if (other.isSetModulus()) { + this.modulus = other.modulus; + } + if (other.isSetExponent()) { + this.exponent = other.exponent; + } + } + + public registerSatellite_args deepCopy() { + return new registerSatellite_args(this); + } + + @Override + public void clear() { + this.organizationId = null; + this.address = null; + this.modulus = null; + this.exponent = null; + } + + public String getOrganizationId() { + return this.organizationId; + } + + public registerSatellite_args setOrganizationId(String organizationId) { + this.organizationId = organizationId; + return this; + } + + public void unsetOrganizationId() { + this.organizationId = null; + } + + /** Returns true if field organizationId is set (has been assigned a value) and false otherwise */ + public boolean isSetOrganizationId() { + return this.organizationId != null; + } + + public void setOrganizationIdIsSet(boolean value) { + if (!value) { + this.organizationId = null; + } + } + + public String getAddress() { + return this.address; + } + + public registerSatellite_args setAddress(String address) { + this.address = address; + return this; + } + + public void unsetAddress() { + this.address = null; + } + + /** Returns true if field address is set (has been assigned a value) and false otherwise */ + public boolean isSetAddress() { + return this.address != null; + } + + public void setAddressIsSet(boolean value) { + if (!value) { + this.address = null; + } + } + + public String getModulus() { + return this.modulus; + } + + public registerSatellite_args setModulus(String modulus) { + this.modulus = modulus; + return this; + } + + public void unsetModulus() { + this.modulus = null; + } + + /** Returns true if field modulus is set (has been assigned a value) and false otherwise */ + public boolean isSetModulus() { + return this.modulus != null; + } + + public void setModulusIsSet(boolean value) { + if (!value) { + this.modulus = null; + } + } + + public String getExponent() { + return this.exponent; + } + + public registerSatellite_args setExponent(String exponent) { + this.exponent = exponent; + return this; + } + + public void unsetExponent() { + this.exponent = null; + } + + /** Returns true if field exponent is set (has been assigned a value) and false otherwise */ + public boolean isSetExponent() { + return this.exponent != null; + } + + public void setExponentIsSet(boolean value) { + if (!value) { + this.exponent = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ORGANIZATION_ID: + if (value == null) { + unsetOrganizationId(); + } else { + setOrganizationId((String)value); + } + break; + + case ADDRESS: + if (value == null) { + unsetAddress(); + } else { + setAddress((String)value); + } + break; + + case MODULUS: + if (value == null) { + unsetModulus(); + } else { + setModulus((String)value); + } + break; + + case EXPONENT: + if (value == null) { + unsetExponent(); + } else { + setExponent((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ORGANIZATION_ID: + return getOrganizationId(); + + case ADDRESS: + return getAddress(); + + case MODULUS: + return getModulus(); + + case EXPONENT: + return getExponent(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ORGANIZATION_ID: + return isSetOrganizationId(); + case ADDRESS: + return isSetAddress(); + case MODULUS: + return isSetModulus(); + case EXPONENT: + return isSetExponent(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof registerSatellite_args) + return this.equals((registerSatellite_args)that); + return false; + } + + public boolean equals(registerSatellite_args that) { + if (that == null) + return false; + + boolean this_present_organizationId = true && this.isSetOrganizationId(); + boolean that_present_organizationId = true && that.isSetOrganizationId(); + if (this_present_organizationId || that_present_organizationId) { + if (!(this_present_organizationId && that_present_organizationId)) + return false; + if (!this.organizationId.equals(that.organizationId)) + return false; + } + + boolean this_present_address = true && this.isSetAddress(); + boolean that_present_address = true && that.isSetAddress(); + if (this_present_address || that_present_address) { + if (!(this_present_address && that_present_address)) + return false; + if (!this.address.equals(that.address)) + return false; + } + + boolean this_present_modulus = true && this.isSetModulus(); + boolean that_present_modulus = true && that.isSetModulus(); + if (this_present_modulus || that_present_modulus) { + if (!(this_present_modulus && that_present_modulus)) + return false; + if (!this.modulus.equals(that.modulus)) + return false; + } + + boolean this_present_exponent = true && this.isSetExponent(); + boolean that_present_exponent = true && that.isSetExponent(); + if (this_present_exponent || that_present_exponent) { + if (!(this_present_exponent && that_present_exponent)) + return false; + if (!this.exponent.equals(that.exponent)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(registerSatellite_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetOrganizationId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetAddress()).compareTo(other.isSetAddress()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAddress()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.address, other.address); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetModulus()).compareTo(other.isSetModulus()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetModulus()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modulus, other.modulus); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetExponent()).compareTo(other.isSetExponent()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetExponent()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exponent, other.exponent); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("registerSatellite_args("); + boolean first = true; + + sb.append("organizationId:"); + if (this.organizationId == null) { + sb.append("null"); + } else { + sb.append(this.organizationId); + } + first = false; + if (!first) sb.append(", "); + sb.append("address:"); + if (this.address == null) { + sb.append("null"); + } else { + sb.append(this.address); + } + first = false; + if (!first) sb.append(", "); + sb.append("modulus:"); + if (this.modulus == null) { + sb.append("null"); + } else { + sb.append(this.modulus); + } + first = false; + if (!first) sb.append(", "); + sb.append("exponent:"); + if (this.exponent == null) { + sb.append("null"); + } else { + sb.append(this.exponent); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class registerSatellite_argsStandardSchemeFactory implements SchemeFactory { + public registerSatellite_argsStandardScheme getScheme() { + return new registerSatellite_argsStandardScheme(); + } + } + + private static class registerSatellite_argsStandardScheme extends StandardScheme<registerSatellite_args> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, registerSatellite_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // ORGANIZATION_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.organizationId = iprot.readString(); + struct.setOrganizationIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // ADDRESS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.address = iprot.readString(); + struct.setAddressIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // MODULUS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.modulus = iprot.readString(); + struct.setModulusIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // EXPONENT + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.exponent = iprot.readString(); + struct.setExponentIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, registerSatellite_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.organizationId != null) { + oprot.writeFieldBegin(ORGANIZATION_ID_FIELD_DESC); + oprot.writeString(struct.organizationId); + oprot.writeFieldEnd(); + } + if (struct.address != null) { + oprot.writeFieldBegin(ADDRESS_FIELD_DESC); + oprot.writeString(struct.address); + oprot.writeFieldEnd(); + } + if (struct.modulus != null) { + oprot.writeFieldBegin(MODULUS_FIELD_DESC); + oprot.writeString(struct.modulus); + oprot.writeFieldEnd(); + } + if (struct.exponent != null) { + oprot.writeFieldBegin(EXPONENT_FIELD_DESC); + oprot.writeString(struct.exponent); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class registerSatellite_argsTupleSchemeFactory implements SchemeFactory { + public registerSatellite_argsTupleScheme getScheme() { + return new registerSatellite_argsTupleScheme(); + } + } + + private static class registerSatellite_argsTupleScheme extends TupleScheme<registerSatellite_args> { + + @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(); + if (struct.isSetOrganizationId()) { + optionals.set(0); + } + if (struct.isSetAddress()) { + optionals.set(1); + } + if (struct.isSetModulus()) { + optionals.set(2); + } + if (struct.isSetExponent()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetOrganizationId()) { + oprot.writeString(struct.organizationId); + } + if (struct.isSetAddress()) { + oprot.writeString(struct.address); + } + if (struct.isSetModulus()) { + oprot.writeString(struct.modulus); + } + if (struct.isSetExponent()) { + oprot.writeString(struct.exponent); + } + } + + @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(4); + if (incoming.get(0)) { + struct.organizationId = iprot.readString(); + struct.setOrganizationIdIsSet(true); + } + if (incoming.get(1)) { + struct.address = iprot.readString(); + struct.setAddressIsSet(true); + } + if (incoming.get(2)) { + struct.modulus = iprot.readString(); + struct.setModulusIsSet(true); + } + if (incoming.get(3)) { + struct.exponent = iprot.readString(); + struct.setExponentIsSet(true); + } + } + } + + } + + public static class registerSatellite_result implements org.apache.thrift.TBase<registerSatellite_result, registerSatellite_result._Fields>, java.io.Serializable, Cloneable, Comparable<registerSatellite_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerSatellite_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new registerSatellite_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new registerSatellite_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerSatellite_result.class, metaDataMap); + } + + public registerSatellite_result() { + } + + public registerSatellite_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public registerSatellite_result(registerSatellite_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public registerSatellite_result deepCopy() { + return new registerSatellite_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public registerSatellite_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof registerSatellite_result) + return this.equals((registerSatellite_result)that); + return false; + } + + public boolean equals(registerSatellite_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(registerSatellite_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("registerSatellite_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class registerSatellite_resultStandardSchemeFactory implements SchemeFactory { + public registerSatellite_resultStandardScheme getScheme() { + return new registerSatellite_resultStandardScheme(); + } + } + + private static class registerSatellite_resultStandardScheme extends StandardScheme<registerSatellite_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, registerSatellite_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, registerSatellite_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class registerSatellite_resultTupleSchemeFactory implements SchemeFactory { + public registerSatellite_resultTupleScheme getScheme() { + return new registerSatellite_resultTupleScheme(); + } + } + + private static class registerSatellite_resultTupleScheme extends TupleScheme<registerSatellite_result> { + + @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(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, registerSatellite_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java index 50a6e5d..e163c4f 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable { +public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTokenException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException"); @@ -163,13 +165,13 @@ public class InvalidTokenException extends TException implements org.apache.thri return 0; } + @Override public int compareTo(InvalidTokenException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - InvalidTokenException typedOther = (InvalidTokenException)other; return 0; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java index 2ca153d..2e40652 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,11 +32,12 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OrganizationData implements org.apache.thrift.TBase<OrganizationData, OrganizationData._Fields>, java.io.Serializable, Cloneable { +public class OrganizationData implements org.apache.thrift.TBase<OrganizationData, OrganizationData._Fields>, java.io.Serializable, Cloneable, Comparable<OrganizationData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OrganizationData"); 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)1); 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 ECP_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("ecpUrl", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -44,11 +47,13 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat public String organizationId; // required public String displayName; // required + public String ecpUrl; // 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 { ORGANIZATION_ID((short)1, "organizationId"), - DISPLAY_NAME((short)2, "displayName"); + DISPLAY_NAME((short)2, "displayName"), + ECP_URL((short)3, "ecpUrl"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -67,6 +72,8 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat return ORGANIZATION_ID; case 2: // DISPLAY_NAME return DISPLAY_NAME; + case 3: // ECP_URL + return ECP_URL; default: return null; } @@ -114,6 +121,8 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.ECP_URL, new org.apache.thrift.meta_data.FieldMetaData("ecpUrl", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OrganizationData.class, metaDataMap); } @@ -123,11 +132,13 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat public OrganizationData( String organizationId, - String displayName) + String displayName, + String ecpUrl) { this(); this.organizationId = organizationId; this.displayName = displayName; + this.ecpUrl = ecpUrl; } /** @@ -140,6 +151,9 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat if (other.isSetDisplayName()) { this.displayName = other.displayName; } + if (other.isSetEcpUrl()) { + this.ecpUrl = other.ecpUrl; + } } public OrganizationData deepCopy() { @@ -150,6 +164,7 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat public void clear() { this.organizationId = null; this.displayName = null; + this.ecpUrl = null; } public String getOrganizationId() { @@ -200,6 +215,30 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat } } + public String getEcpUrl() { + return this.ecpUrl; + } + + public OrganizationData setEcpUrl(String ecpUrl) { + this.ecpUrl = ecpUrl; + return this; + } + + public void unsetEcpUrl() { + this.ecpUrl = null; + } + + /** Returns true if field ecpUrl is set (has been assigned a value) and false otherwise */ + public boolean isSetEcpUrl() { + return this.ecpUrl != null; + } + + public void setEcpUrlIsSet(boolean value) { + if (!value) { + this.ecpUrl = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ORGANIZATION_ID: @@ -218,6 +257,14 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat } break; + case ECP_URL: + if (value == null) { + unsetEcpUrl(); + } else { + setEcpUrl((String)value); + } + break; + } } @@ -229,6 +276,9 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat case DISPLAY_NAME: return getDisplayName(); + case ECP_URL: + return getEcpUrl(); + } throw new IllegalStateException(); } @@ -244,6 +294,8 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat return isSetOrganizationId(); case DISPLAY_NAME: return isSetDisplayName(); + case ECP_URL: + return isSetEcpUrl(); } throw new IllegalStateException(); } @@ -279,6 +331,15 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat return false; } + boolean this_present_ecpUrl = true && this.isSetEcpUrl(); + boolean that_present_ecpUrl = true && that.isSetEcpUrl(); + if (this_present_ecpUrl || that_present_ecpUrl) { + if (!(this_present_ecpUrl && that_present_ecpUrl)) + return false; + if (!this.ecpUrl.equals(that.ecpUrl)) + return false; + } + return true; } @@ -287,30 +348,40 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat return 0; } + @Override public int compareTo(OrganizationData other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - OrganizationData typedOther = (OrganizationData)other; - lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId()); + lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId()); if (lastComparison != 0) { return lastComparison; } if (isSetOrganizationId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(typedOther.isSetDisplayName()); + lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName()); if (lastComparison != 0) { return lastComparison; } if (isSetDisplayName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.displayName, typedOther.displayName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.displayName, other.displayName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetEcpUrl()).compareTo(other.isSetEcpUrl()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetEcpUrl()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ecpUrl, other.ecpUrl); if (lastComparison != 0) { return lastComparison; } @@ -350,6 +421,14 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat sb.append(this.displayName); } first = false; + if (!first) sb.append(", "); + sb.append("ecpUrl:"); + if (this.ecpUrl == null) { + sb.append("null"); + } else { + sb.append(this.ecpUrl); + } + first = false; sb.append(")"); return sb.toString(); } @@ -409,6 +488,14 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // ECP_URL + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.ecpUrl = iprot.readString(); + struct.setEcpUrlIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -434,6 +521,11 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat oprot.writeString(struct.displayName); oprot.writeFieldEnd(); } + if (struct.ecpUrl != null) { + oprot.writeFieldBegin(ECP_URL_FIELD_DESC); + oprot.writeString(struct.ecpUrl); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -458,19 +550,25 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat if (struct.isSetDisplayName()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetEcpUrl()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetOrganizationId()) { oprot.writeString(struct.organizationId); } if (struct.isSetDisplayName()) { oprot.writeString(struct.displayName); } + if (struct.isSetEcpUrl()) { + oprot.writeString(struct.ecpUrl); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, OrganizationData struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.organizationId = iprot.readString(); struct.setOrganizationIdIsSet(true); @@ -479,6 +577,10 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat struct.displayName = iprot.readString(); struct.setDisplayNameIsSet(true); } + if (incoming.get(2)) { + struct.ecpUrl = iprot.readString(); + struct.setEcpUrlIsSet(true); + } } } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java index ce5482a..8f8893a 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable { +public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ServerSessionData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerSessionData"); 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); @@ -228,20 +230,20 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD return 0; } + @Override public int compareTo(ServerSessionData other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - ServerSessionData typedOther = (ServerSessionData)other; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId()); + lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java index a1a30e1..711abeb 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable { +public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable, Comparable<SessionData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SessionData"); 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); @@ -346,40 +348,40 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session return 0; } + @Override public int compareTo(SessionData other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - SessionData typedOther = (SessionData)other; - lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId()); + lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); if (lastComparison != 0) { return lastComparison; } if (isSetSessionId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(typedOther.isSetAuthToken()); + lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, typedOther.authToken); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, other.authToken); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(typedOther.isSetServerAddress()); + lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(other.isSetServerAddress()); if (lastComparison != 0) { return lastComparison; } if (isSetServerAddress()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, typedOther.serverAddress); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, other.serverAddress); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java index 45a589e..314920e 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class UploadData implements org.apache.thrift.TBase<UploadData, UploadData._Fields>, java.io.Serializable, Cloneable { +public class UploadData implements org.apache.thrift.TBase<UploadData, UploadData._Fields>, java.io.Serializable, Cloneable, Comparable<UploadData> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadData"); 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); @@ -289,30 +291,30 @@ public class UploadData implements org.apache.thrift.TBase<UploadData, UploadDat return 0; } + @Override public int compareTo(UploadData other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - UploadData typedOther = (UploadData)other; - lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken()); + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); if (lastComparison != 0) { return lastComparison; } if (isSetToken()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort()); + lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort()); if (lastComparison != 0) { return lastComparison; } if (isSetPort()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java index bcac7e1..963ff1c 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java index eeaee66..bc4c150 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable { +public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable, Comparable<UploadException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadException"); private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); @@ -303,30 +305,30 @@ public class UploadException extends TException implements org.apache.thrift.TBa return 0; } + @Override public int compareTo(UploadException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - UploadException typedOther = (UploadException)other; - lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber()); + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); if (lastComparison != 0) { return lastComparison; } if (isSetNumber()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java index d5c3a69..2d9581b 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.1) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -15,6 +15,8 @@ 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; @@ -30,7 +32,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable { +public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable, Comparable<UserInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserInfo"); private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -464,60 +466,60 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie return 0; } + @Override public int compareTo(UserInfo other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - UserInfo typedOther = (UserInfo)other; - lastComparison = Boolean.valueOf(isSetUserId()).compareTo(typedOther.isSetUserId()); + lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId()); if (lastComparison != 0) { return lastComparison; } if (isSetUserId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, typedOther.userId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(typedOther.isSetFirstName()); + lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); if (lastComparison != 0) { return lastComparison; } if (isSetFirstName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, typedOther.firstName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLastName()).compareTo(typedOther.isSetLastName()); + lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); if (lastComparison != 0) { return lastComparison; } if (isSetLastName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, typedOther.lastName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEMail()).compareTo(typedOther.isSetEMail()); + lastComparison = Boolean.valueOf(isSetEMail()).compareTo(other.isSetEMail()); if (lastComparison != 0) { return lastComparison; } if (isSetEMail()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, typedOther.eMail); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, other.eMail); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId()); + lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId()); if (lastComparison != 0) { return lastComparison; } if (isSetOrganizationId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId); if (lastComparison != 0) { return lastComparison; } diff --git a/src/main/thrift/imagemaster.thrift b/src/main/thrift/imagemaster.thrift index 66c9023..157606c 100644 --- a/src/main/thrift/imagemaster.thrift +++ b/src/main/thrift/imagemaster.thrift @@ -78,6 +78,7 @@ struct UserInfo { struct OrganizationData { 1: string organizationId, 2: string displayName, + 3: string ecpUrl, } struct SessionData { @@ -148,4 +149,6 @@ service ImageServer { bool publishUser(1:ID serverSessionId, 2:UserInfo user) throws (1:AuthorizationException failure), + bool registerSatellite(1:string organizationId, 2:string address, 3:string modulus, 4:string exponent), + } diff --git a/thrift-compile.sh b/thrift-compile.sh index 76be97c..4ff5b17 100755 --- a/thrift-compile.sh +++ b/thrift-compile.sh @@ -2,6 +2,7 @@ rm -r gen-java thrift --gen java src/main/thrift/imagemaster.thrift && { +# find gen-java -type f -name "*.java" -exec sed -i 's/Autogenerated by Thrift Compiler \(.*\)/Autogenerated by Thrift Compiler/g' {} \; rm -r src/main/java/org/openslx/imagemaster/thrift/iface cp -r gen-java/org src/main/java/ } |