Skip to content

Commit 49680bf

Browse files
Fix issue #374 driveItem.additionalDataManager().put() not working (#375)
* Fix issue #374 driveItem.additionalDataManager().put() not working * Remove transient property check * Remove testSkipTransientDatatest We now serialize all instance annotations
1 parent 6489f0f commit 49680bf

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,18 +256,9 @@ else if (fieldObject != null && fieldObject instanceof IJsonBackedObject) {
256256
*/
257257
private void addAdditionalDataToJson(AdditionalDataManager additionalDataManager, JsonObject jsonNode) {
258258
for (Map.Entry<String, JsonElement> entry : additionalDataManager.entrySet()) {
259-
if (!fieldIsOdataTransient(entry)) {
260-
jsonNode.add(
261-
entry.getKey(),
262-
entry.getValue()
263-
);
264-
}
259+
jsonNode.add(entry.getKey(), entry.getValue());
265260
}
266261
}
267-
268-
private boolean fieldIsOdataTransient(Map.Entry<String, JsonElement> entry) {
269-
return (entry.getKey().startsWith("@") && entry.getKey() != "@odata.type");
270-
}
271262

272263
/**
273264
* Get the derived class for the given JSON object

src/test/java/com/microsoft/graph/serializer/AdditionalDataTests.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,6 @@ public void testChildAdditionalData() {
5656
assertEquals("{\"manager\":{\"id\":\"1\",\"additionalData\":\"additionalValue\"},\"id\":\"2\"}", serializedObject);
5757
}
5858

59-
@Test
60-
public void testSkipTransientData() {
61-
Entity entity = new Entity();
62-
entity.id = "1";
63-
64-
entity.additionalDataManager().put("@odata.type", new JsonPrimitive("entity"));
65-
entity.additionalDataManager().put("@odata.nextLink", new JsonPrimitive("1"));
66-
67-
String serializedObject = serializer.serializeObject(entity);
68-
69-
assertEquals("{\"id\":\"1\",\"@odata.type\":\"entity\"}", serializedObject);
70-
}
71-
7259
@Test
7360
public void testHashMapChildAnnotationData() {
7461
PlannerTask task = new PlannerTask();

0 commit comments

Comments
 (0)