diff options
author | Björn Hagemeister | 2014-09-23 16:26:32 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-09-23 16:26:32 +0200 |
commit | 457a6152aeec27ef941db8f0c50700c25c09390e (patch) | |
tree | 72fef6e41f5a37aea82b0defc78b8f387320fd3d /src | |
parent | First adaptions to new filetransfer class. (diff) | |
download | master-sync-shared-457a6152aeec27ef941db8f0c50700c25c09390e.tar.gz master-sync-shared-457a6152aeec27ef941db8f0c50700c25c09390e.tar.xz master-sync-shared-457a6152aeec27ef941db8f0c50700c25c09390e.zip |
Removed missingBlocks and allBlocksValid from uploadInfos.
Diffstat (limited to 'src')
3 files changed, 20 insertions, 268 deletions
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 7cef221..33372d2 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java @@ -6068,13 +6068,13 @@ public class ImageServer { case 3: // CRC_SUMS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); - struct.crcSums = new ArrayList<Integer>(_list8.size); - for (int _i9 = 0; _i9 < _list8.size; ++_i9) + org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); + struct.crcSums = new ArrayList<Integer>(_list0.size); + for (int _i1 = 0; _i1 < _list0.size; ++_i1) { - int _elem10; // required - _elem10 = iprot.readI32(); - struct.crcSums.add(_elem10); + int _elem2; // required + _elem2 = iprot.readI32(); + struct.crcSums.add(_elem2); } iprot.readListEnd(); } @@ -6112,9 +6112,9 @@ public class ImageServer { oprot.writeFieldBegin(CRC_SUMS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.crcSums.size())); - for (int _iter11 : struct.crcSums) + for (int _iter3 : struct.crcSums) { - oprot.writeI32(_iter11); + oprot.writeI32(_iter3); } oprot.writeListEnd(); } @@ -6157,9 +6157,9 @@ public class ImageServer { if (struct.isSetCrcSums()) { { oprot.writeI32(struct.crcSums.size()); - for (int _iter12 : struct.crcSums) + for (int _iter4 : struct.crcSums) { - oprot.writeI32(_iter12); + oprot.writeI32(_iter4); } } } @@ -6180,13 +6180,13 @@ public class ImageServer { } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.crcSums = new ArrayList<Integer>(_list13.size); - for (int _i14 = 0; _i14 < _list13.size; ++_i14) + org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.crcSums = new ArrayList<Integer>(_list5.size); + for (int _i6 = 0; _i6 < _list5.size; ++_i6) { - int _elem15; // required - _elem15 = iprot.readI32(); - struct.crcSums.add(_elem15); + int _elem7; // required + _elem7 = iprot.readI32(); + struct.crcSums.add(_elem7); } } struct.setCrcSumsIsSet(true); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java index be49273..3de9d62 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java @@ -35,8 +35,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2); - private static final org.apache.thrift.protocol.TField MISSING_BLOCKS_FIELD_DESC = new org.apache.thrift.protocol.TField("missingBlocks", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final org.apache.thrift.protocol.TField ALL_BLOCKS_VALID_FIELD_DESC = new org.apache.thrift.protocol.TField("allBlocksValid", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -46,15 +44,11 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI public String token; // required public int port; // required - public List<Integer> missingBlocks; // required - public boolean allBlocksValid; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TOKEN((short)1, "token"), - PORT((short)2, "port"), - MISSING_BLOCKS((short)3, "missingBlocks"), - ALL_BLOCKS_VALID((short)4, "allBlocksValid"); + PORT((short)2, "port"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -73,10 +67,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI return TOKEN; case 2: // PORT return PORT; - case 3: // MISSING_BLOCKS - return MISSING_BLOCKS; - case 4: // ALL_BLOCKS_VALID - return ALL_BLOCKS_VALID; default: return null; } @@ -118,7 +108,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI // isset id assignments private static final int __PORT_ISSET_ID = 0; - private static final int __ALLBLOCKSVALID_ISSET_ID = 1; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -127,11 +116,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.MISSING_BLOCKS, new org.apache.thrift.meta_data.FieldMetaData("missingBlocks", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)))); - tmpMap.put(_Fields.ALL_BLOCKS_VALID, new org.apache.thrift.meta_data.FieldMetaData("allBlocksValid", 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(UploadInfos.class, metaDataMap); } @@ -141,17 +125,12 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI public UploadInfos( String token, - int port, - List<Integer> missingBlocks, - boolean allBlocksValid) + int port) { this(); this.token = token; this.port = port; setPortIsSet(true); - this.missingBlocks = missingBlocks; - this.allBlocksValid = allBlocksValid; - setAllBlocksValidIsSet(true); } /** @@ -163,14 +142,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI this.token = other.token; } this.port = other.port; - if (other.isSetMissingBlocks()) { - List<Integer> __this__missingBlocks = new ArrayList<Integer>(); - for (Integer other_element : other.missingBlocks) { - __this__missingBlocks.add(other_element); - } - this.missingBlocks = __this__missingBlocks; - } - this.allBlocksValid = other.allBlocksValid; } public UploadInfos deepCopy() { @@ -182,9 +153,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI this.token = null; setPortIsSet(false); this.port = 0; - this.missingBlocks = null; - setAllBlocksValidIsSet(false); - this.allBlocksValid = false; } public String getToken() { @@ -234,68 +202,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value); } - public int getMissingBlocksSize() { - return (this.missingBlocks == null) ? 0 : this.missingBlocks.size(); - } - - public java.util.Iterator<Integer> getMissingBlocksIterator() { - return (this.missingBlocks == null) ? null : this.missingBlocks.iterator(); - } - - public void addToMissingBlocks(int elem) { - if (this.missingBlocks == null) { - this.missingBlocks = new ArrayList<Integer>(); - } - this.missingBlocks.add(elem); - } - - public List<Integer> getMissingBlocks() { - return this.missingBlocks; - } - - public UploadInfos setMissingBlocks(List<Integer> missingBlocks) { - this.missingBlocks = missingBlocks; - return this; - } - - public void unsetMissingBlocks() { - this.missingBlocks = null; - } - - /** Returns true if field missingBlocks is set (has been assigned a value) and false otherwise */ - public boolean isSetMissingBlocks() { - return this.missingBlocks != null; - } - - public void setMissingBlocksIsSet(boolean value) { - if (!value) { - this.missingBlocks = null; - } - } - - public boolean isAllBlocksValid() { - return this.allBlocksValid; - } - - public UploadInfos setAllBlocksValid(boolean allBlocksValid) { - this.allBlocksValid = allBlocksValid; - setAllBlocksValidIsSet(true); - return this; - } - - public void unsetAllBlocksValid() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ALLBLOCKSVALID_ISSET_ID); - } - - /** Returns true if field allBlocksValid is set (has been assigned a value) and false otherwise */ - public boolean isSetAllBlocksValid() { - return EncodingUtils.testBit(__isset_bitfield, __ALLBLOCKSVALID_ISSET_ID); - } - - public void setAllBlocksValidIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ALLBLOCKSVALID_ISSET_ID, value); - } - public void setFieldValue(_Fields field, Object value) { switch (field) { case TOKEN: @@ -314,22 +220,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI } break; - case MISSING_BLOCKS: - if (value == null) { - unsetMissingBlocks(); - } else { - setMissingBlocks((List<Integer>)value); - } - break; - - case ALL_BLOCKS_VALID: - if (value == null) { - unsetAllBlocksValid(); - } else { - setAllBlocksValid((Boolean)value); - } - break; - } } @@ -341,12 +231,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI case PORT: return Integer.valueOf(getPort()); - case MISSING_BLOCKS: - return getMissingBlocks(); - - case ALL_BLOCKS_VALID: - return Boolean.valueOf(isAllBlocksValid()); - } throw new IllegalStateException(); } @@ -362,10 +246,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI return isSetToken(); case PORT: return isSetPort(); - case MISSING_BLOCKS: - return isSetMissingBlocks(); - case ALL_BLOCKS_VALID: - return isSetAllBlocksValid(); } throw new IllegalStateException(); } @@ -401,24 +281,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI return false; } - boolean this_present_missingBlocks = true && this.isSetMissingBlocks(); - boolean that_present_missingBlocks = true && that.isSetMissingBlocks(); - if (this_present_missingBlocks || that_present_missingBlocks) { - if (!(this_present_missingBlocks && that_present_missingBlocks)) - return false; - if (!this.missingBlocks.equals(that.missingBlocks)) - return false; - } - - boolean this_present_allBlocksValid = true; - boolean that_present_allBlocksValid = true; - if (this_present_allBlocksValid || that_present_allBlocksValid) { - if (!(this_present_allBlocksValid && that_present_allBlocksValid)) - return false; - if (this.allBlocksValid != that.allBlocksValid) - return false; - } - return true; } @@ -455,26 +317,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMissingBlocks()).compareTo(typedOther.isSetMissingBlocks()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetMissingBlocks()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.missingBlocks, typedOther.missingBlocks); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetAllBlocksValid()).compareTo(typedOther.isSetAllBlocksValid()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAllBlocksValid()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.allBlocksValid, typedOther.allBlocksValid); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -506,18 +348,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI sb.append("port:"); sb.append(this.port); first = false; - if (!first) sb.append(", "); - sb.append("missingBlocks:"); - if (this.missingBlocks == null) { - sb.append("null"); - } else { - sb.append(this.missingBlocks); - } - first = false; - if (!first) sb.append(", "); - sb.append("allBlocksValid:"); - sb.append(this.allBlocksValid); - first = false; sb.append(")"); return sb.toString(); } @@ -579,32 +409,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // MISSING_BLOCKS - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.missingBlocks = new ArrayList<Integer>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) - { - int _elem2; // required - _elem2 = iprot.readI32(); - struct.missingBlocks.add(_elem2); - } - iprot.readListEnd(); - } - struct.setMissingBlocksIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // ALL_BLOCKS_VALID - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.allBlocksValid = iprot.readBool(); - struct.setAllBlocksValidIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -628,21 +432,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI oprot.writeFieldBegin(PORT_FIELD_DESC); oprot.writeI32(struct.port); oprot.writeFieldEnd(); - if (struct.missingBlocks != null) { - oprot.writeFieldBegin(MISSING_BLOCKS_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.missingBlocks.size())); - for (int _iter3 : struct.missingBlocks) - { - oprot.writeI32(_iter3); - } - oprot.writeListEnd(); - } - oprot.writeFieldEnd(); - } - oprot.writeFieldBegin(ALL_BLOCKS_VALID_FIELD_DESC); - oprot.writeBool(struct.allBlocksValid); - oprot.writeFieldEnd(); oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -667,37 +456,19 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI if (struct.isSetPort()) { optionals.set(1); } - if (struct.isSetMissingBlocks()) { - optionals.set(2); - } - if (struct.isSetAllBlocksValid()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 2); if (struct.isSetToken()) { oprot.writeString(struct.token); } if (struct.isSetPort()) { oprot.writeI32(struct.port); } - if (struct.isSetMissingBlocks()) { - { - oprot.writeI32(struct.missingBlocks.size()); - for (int _iter4 : struct.missingBlocks) - { - oprot.writeI32(_iter4); - } - } - } - if (struct.isSetAllBlocksValid()) { - oprot.writeBool(struct.allBlocksValid); - } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, UploadInfos struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.token = iprot.readString(); struct.setTokenIsSet(true); @@ -706,23 +477,6 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI struct.port = iprot.readI32(); struct.setPortIsSet(true); } - if (incoming.get(2)) { - { - org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.missingBlocks = new ArrayList<Integer>(_list5.size); - for (int _i6 = 0; _i6 < _list5.size; ++_i6) - { - int _elem7; // required - _elem7 = iprot.readI32(); - struct.missingBlocks.add(_elem7); - } - } - struct.setMissingBlocksIsSet(true); - } - if (incoming.get(3)) { - struct.allBlocksValid = iprot.readBool(); - struct.setAllBlocksValidIsSet(true); - } } } diff --git a/src/main/thrift/imagemaster.thrift b/src/main/thrift/imagemaster.thrift index e2180e0..7b8e8c1 100644 --- a/src/main/thrift/imagemaster.thrift +++ b/src/main/thrift/imagemaster.thrift @@ -90,8 +90,6 @@ struct FtpCredentials { struct UploadInfos { 1: string token, 2: i32 port, - 3: list<i32> missingBlocks, - 4: bool allBlocksValid } struct DownloadInfos { |