Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #39 from jcookems/fix236

Fix236: EdmType.GUID should map to java.util.UUID
  • Loading branch information...
commit 640093e446e64e2a67ce4acd1463a9ee49bae05e 2 parents e629c80 + 2c82f1e
Albert Cheng authored
View
4 ...api/src/main/java/com/microsoft/windowsazure/services/table/implementation/DefaultEdmValueConterter.java
@@ -16,6 +16,7 @@
import java.text.ParseException;
import java.util.Date;
+import java.util.UUID;
import javax.inject.Inject;
@@ -80,6 +81,9 @@ else if (EdmType.INT64.equals(edmType)) {
else if (EdmType.BINARY.equals(edmType)) {
return Base64.decode(value);
}
+ else if (EdmType.GUID.equals(edmType)) {
+ return UUID.fromString(value);
+ }
return value;
}
View
8 ...osoft-azure-api/src/test/java/com/microsoft/windowsazure/services/table/TableServiceIntegrationTest.java
@@ -302,10 +302,12 @@ public void insertEntityWorks() throws Exception {
Configuration config = createConfiguration();
TableContract service = TableService.create(config);
byte[] binaryData = new byte[] { 1, 2, 3, 4 };
+ UUID uuid = UUID.randomUUID();
Entity entity = new Entity().setPartitionKey("001").setRowKey("insertEntityWorks")
.setProperty("test", EdmType.BOOLEAN, true).setProperty("test2", EdmType.STRING, "value")
.setProperty("test3", EdmType.INT32, 3).setProperty("test4", EdmType.INT64, 12345678901L)
- .setProperty("test5", EdmType.DATETIME, new Date()).setProperty("test6", EdmType.BINARY, binaryData);
+ .setProperty("test5", EdmType.DATETIME, new Date()).setProperty("test6", EdmType.BINARY, binaryData)
+ .setProperty("test7", EdmType.GUID, uuid);
// Act
InsertEntityResult result = service.insertEntity(TEST_TABLE_2, entity);
@@ -341,6 +343,10 @@ public void insertEntityWorks() throws Exception {
for (int i = 0; i < binaryData.length; i++) {
assertEquals(binaryData[i], returnedBinaryData[i]);
}
+
+ assertNotNull(result.getEntity().getProperty("test7"));
+ assertTrue(result.getEntity().getProperty("test7").getValue() instanceof UUID);
+ assertEquals(uuid.toString(), result.getEntity().getProperty("test7").getValue().toString());
}
@Test
Please sign in to comment.
Something went wrong with that request. Please try again.