Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix236: EdmType.GUID should map to java.util.UUID #39

Merged
merged 2 commits into from
Apr 6, 2012
Merged

Fix236: EdmType.GUID should map to java.util.UUID #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c884a33
Fix 236: Table: EdmType.GUID should map to java.util.UUID
jcookems Apr 5, 2012
2c82f1e
Added unit test for round-tripping UUID values
jcookems Apr 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...va/com/microsoft/windowsazure/services/table/implementation/DefaultEdmValueConterter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.text.ParseException;
import java.util.Date;
import java.util.UUID;

import javax.inject.Inject;

Expand Down Expand Up @@ -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;
}
Expand Down
8 changes: 7 additions & 1 deletion .../src/test/java/com/microsoft/windowsazure/services/table/TableServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down