From e18a37ac197916933304dff89d43561f71135af8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 1 Sep 2015 16:18:31 +0200
Subject: Make machineDescription binary in TransferInformation

---
 .../bwlp/thrift/iface/TransferInformation.java     | 35 ++++++++++++++--------
 .../org/openslx/filetransfer/util/ChunkList.java   | 13 +++++++-
 src/main/thrift/bwlp.thrift                        |  2 +-
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
index 9381d0c..19a1d8c 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
@@ -51,7 +51,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   public int plainPort; // required
   public int sslPort; // required
   public List<ByteBuffer> blockHashes; // optional
-  public String machineDescription; // optional
+  public ByteBuffer machineDescription; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -141,7 +141,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
     tmpMap.put(_Fields.MACHINE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("machineDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TransferInformation.class, metaDataMap);
   }
@@ -177,7 +177,8 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       this.blockHashes = __this__blockHashes;
     }
     if (other.isSetMachineDescription()) {
-      this.machineDescription = other.machineDescription;
+      this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(other.machineDescription);
+;
     }
   }
 
@@ -305,11 +306,21 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     }
   }
 
-  public String getMachineDescription() {
-    return this.machineDescription;
+  public byte[] getMachineDescription() {
+    setMachineDescription(org.apache.thrift.TBaseHelper.rightSize(machineDescription));
+    return machineDescription == null ? null : machineDescription.array();
   }
 
-  public TransferInformation setMachineDescription(String machineDescription) {
+  public ByteBuffer bufferForMachineDescription() {
+    return machineDescription;
+  }
+
+  public TransferInformation setMachineDescription(byte[] machineDescription) {
+    setMachineDescription(machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(machineDescription));
+    return this;
+  }
+
+  public TransferInformation setMachineDescription(ByteBuffer machineDescription) {
     this.machineDescription = machineDescription;
     return this;
   }
@@ -367,7 +378,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (value == null) {
         unsetMachineDescription();
       } else {
-        setMachineDescription((String)value);
+        setMachineDescription((ByteBuffer)value);
       }
       break;
 
@@ -591,7 +602,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (this.machineDescription == null) {
         sb.append("null");
       } else {
-        sb.append(this.machineDescription);
+        org.apache.thrift.TBaseHelper.toString(this.machineDescription, sb);
       }
       first = false;
     }
@@ -684,7 +695,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
             break;
           case 5: // MACHINE_DESCRIPTION
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.machineDescription = iprot.readString();
+              struct.machineDescription = iprot.readBinary();
               struct.setMachineDescriptionIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -733,7 +744,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (struct.machineDescription != null) {
         if (struct.isSetMachineDescription()) {
           oprot.writeFieldBegin(MACHINE_DESCRIPTION_FIELD_DESC);
-          oprot.writeString(struct.machineDescription);
+          oprot.writeBinary(struct.machineDescription);
           oprot.writeFieldEnd();
         }
       }
@@ -790,7 +801,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         }
       }
       if (struct.isSetMachineDescription()) {
-        oprot.writeString(struct.machineDescription);
+        oprot.writeBinary(struct.machineDescription);
       }
     }
 
@@ -824,7 +835,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         struct.setBlockHashesIsSet(true);
       }
       if (incoming.get(4)) {
-        struct.machineDescription = iprot.readString();
+        struct.machineDescription = iprot.readBinary();
         struct.setMachineDescriptionIsSet(true);
       }
     }
diff --git a/src/main/java/org/openslx/filetransfer/util/ChunkList.java b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
index 4a55278..c71777b 100644
--- a/src/main/java/org/openslx/filetransfer/util/ChunkList.java
+++ b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
@@ -2,6 +2,7 @@ package org.openslx.filetransfer.util;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -39,7 +40,7 @@ public class ChunkList
 	{
 		FileChunk.createChunkList( missingChunks, fileSize, sha1Sums );
 		statusArray = ByteBuffer.allocate( missingChunks.size() );
-		allChunks = new ArrayList<>( missingChunks );
+		allChunks = Collections.unmodifiableList( new ArrayList<>( missingChunks ) );
 	}
 
 	/**
@@ -234,4 +235,14 @@ public class ChunkList
 		return sb.toString();
 	}
 
+	public synchronized boolean isEmpty()
+	{
+		return allChunks.isEmpty();
+	}
+
+	public List<FileChunk> getAll()
+	{
+		return allChunks;
+	}
+
 }
diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift
index 7189842..91e904d 100644
--- a/src/main/thrift/bwlp.thrift
+++ b/src/main/thrift/bwlp.thrift
@@ -314,7 +314,7 @@ struct TransferInformation {
 	2: i32 plainPort,
 	3: i32 sslPort,
 	4: optional list<binary> blockHashes, // Only if transfer is a download (and list is known)
-	5: optional string machineDescription, // Only if transfer is a download
+	5: optional binary machineDescription, // Only if transfer is a download
 }
 
 // Used to tell status of an upload. The blockStatus is one byte per 16MB block,
-- 
cgit v1.2.3-55-g7522