Skip to content

Commit ccfd990

Browse files
baywetbaywet
authored
Merge pull request #298 from microsoftgraph/feature/collection-navigation-props-raw-object
feature/collection navigation props raw object
2 parents a4e8c3a + 4264bee commit ccfd990

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+10
-182
lines changed

‎src/GraphODataTemplateWriter/CodeHelpers/Java/TypeHelperJava.cs‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,6 @@ public static string CreatePackageDefForEntity(this CustomT4Host host)
10451045
sb.AppendFormat(@"import {0}.serializer.ISerializer;
10461046
import {0}.serializer.IJsonBackedObject;
10471047
import {0}.serializer.AdditionalDataManager;
1048-
import java.util.Arrays;
10491048
import java.util.EnumSet;", host.CurrentModel.GetNamespace().AddPrefix());
10501049

10511050
sb.Append("\n");
@@ -1129,18 +1128,6 @@ public static string CreatePackageDefForEntity(this CustomT4Host host)
11291128
if (property.Type is OdcmPrimitiveType)
11301129
continue;
11311130

1132-
var propertyType = TypeCollectionResponse(property);
1133-
string importstr = String.Format(importFormat,
1134-
property.Projection.Type.Namespace.Name.AddPrefix(),
1135-
GetPrefixForRequests(),
1136-
propertyType);
1137-
if (!uniqueStore.ContainsKey(importstr))
1138-
{
1139-
uniqueStore.Add(importstr, 0);
1140-
sb.Append(importstr);
1141-
sb.Append("\n");
1142-
}
1143-
11441131
string propertyValue = TypeCollectionPage(property);
11451132
string importstr1 = String.Format(importFormat,
11461133
property.Projection.Type.Namespace.Name.AddPrefix(),
@@ -1354,25 +1341,11 @@ public static string UpdatePropertiesWithinSetRawObject(IEnumerable<OdcmProperty
13541341
sb.AppendFormat(
13551342
@"
13561343
if (json.has(""{0}"")) {{
1357-
final {1} response = new {1}();
1358-
if (json.has(""{0}@odata.nextLink"")) {{
1359-
response.nextLink = json.get(""{0}@odata.nextLink"").getAsString();
1360-
}}
1361-
1362-
final JsonObject[] sourceArray = serializer.deserializeObject(json.get(""{0}"").toString(), JsonObject[].class);
1363-
final {3}[] array = new {3}[sourceArray.length];
1364-
for (int i = 0; i < sourceArray.length; i++) {{
1365-
array[i] = serializer.deserializeObject(sourceArray[i].toString(), {3}.class);
1366-
array[i].setRawObject(serializer, sourceArray[i]);
1367-
}}
1368-
response.value = Arrays.asList(array);
1369-
{0} = new {2}(response, null);
1344+
{0} = serializer.deserializeObject(json.get(""{0}"").toString(), {1}.class);
13701345
}}
13711346
",
13721347
property.Name.SanitizePropertyName(property),
1373-
TypeCollectionResponse(property),
1374-
TypeCollectionPage(property),
1375-
property.GetTypeString());
1348+
TypeCollectionPage(property));
13761349
}
13771350
}
13781351
sb.Append(" }");

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Call.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.models.extensions.Entity;
1211

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/CloudCommunications.java‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.models.extensions.Call;
1211
import com.microsoft.graph2.callrecords.models.extensions.CallRecord;
1312
import com.microsoft.graph.models.extensions.Entity;
14-
import com.microsoft.graph.requests.extensions.CallCollectionResponse;
1513
import com.microsoft.graph.requests.extensions.CallCollectionPage;
16-
import com.microsoft.graph2.callrecords.requests.extensions.CallRecordCollectionResponse;
1714
import com.microsoft.graph2.callrecords.requests.extensions.CallRecordCollectionPage;
1815

1916

@@ -86,35 +83,11 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
8683

8784

8885
if (json.has("calls")) {
89-
final CallCollectionResponse response = new CallCollectionResponse();
90-
if (json.has("[email protected]")) {
91-
response.nextLink = json.get("[email protected]").getAsString();
92-
}
93-
94-
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("calls").toString(), JsonObject[].class);
95-
final Call[] array = new Call[sourceArray.length];
96-
for (int i = 0; i < sourceArray.length; i++) {
97-
array[i] = serializer.deserializeObject(sourceArray[i].toString(), Call.class);
98-
array[i].setRawObject(serializer, sourceArray[i]);
99-
}
100-
response.value = Arrays.asList(array);
101-
calls = new CallCollectionPage(response, null);
86+
calls = serializer.deserializeObject(json.get("calls").toString(), CallCollectionPage.class);
10287
}
10388

10489
if (json.has("callRecords")) {
105-
final CallRecordCollectionResponse response = new CallRecordCollectionResponse();
106-
if (json.has("[email protected]")) {
107-
response.nextLink = json.get("[email protected]").getAsString();
108-
}
109-
110-
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("callRecords").toString(), JsonObject[].class);
111-
final CallRecord[] array = new CallRecord[sourceArray.length];
112-
for (int i = 0; i < sourceArray.length; i++) {
113-
array[i] = serializer.deserializeObject(sourceArray[i].toString(), CallRecord.class);
114-
array[i].setRawObject(serializer, sourceArray[i]);
115-
}
116-
response.value = Arrays.asList(array);
117-
callRecords = new CallRecordCollectionPage(response, null);
90+
callRecords = serializer.deserializeObject(json.get("callRecords").toString(), CallRecordCollectionPage.class);
11891
}
11992
}
12093
}

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/DerivedComplexTypeRequest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.models.generated.Enum1;
1211
import com.microsoft.graph.models.extensions.EmptyBaseComplexTypeRequest;

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EmptyBaseComplexTypeRequest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110

1211

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EmptyComplexType.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110

1211

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Endpoint.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.models.extensions.Entity;
1211

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Entity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110

1211

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EntityType2.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.models.extensions.Entity;
1211

‎test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EntityType3.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.models.extensions.Entity;
1211

0 commit comments

Comments
 (0)