Skip to content

Commit 0041e58

Browse files
Generated v1.0 models and request builders using Typewriter (#311) - 1.7.0
* Update generated files with build 1938160 * Delete .travis.yml - no need to use Travis * Updated minor version to 1.7.0
1 parent 8dcf5a8 commit 0041e58

File tree

326 files changed

+19182
-1680
lines changed

Some content is hidden

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

326 files changed

+19182
-1680
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mavenBintraySnapshotUrl = http://oss.jfrog.org/artifactory/oss-snapshot-local
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
2828
mavenMajorVersion = 1
29-
mavenMinorVersion = 6
29+
mavenMinorVersion = 7
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.concurrency.*;
7+
import com.microsoft.graph.core.*;
8+
import com.microsoft.graph.http.*;
9+
import com.microsoft.graph.options.*;
10+
import com.microsoft.graph.serializer.*;
11+
import java.util.Arrays;
12+
import java.util.EnumSet;
13+
import com.microsoft.graph.models.extensions.MediaConfig;
14+
15+
16+
import com.google.gson.JsonObject;
17+
import com.google.gson.JsonElement;
18+
import com.google.gson.annotations.*;
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
22+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
23+
24+
/**
25+
* The class for the App Hosted Media Config.
26+
*/
27+
public class AppHostedMediaConfig extends MediaConfig implements IJsonBackedObject {
28+
29+
30+
/**
31+
* The Blob.
32+
*
33+
*/
34+
@SerializedName("blob")
35+
@Expose
36+
public String blob;
37+
38+
39+
/**
40+
* The raw representation of this class
41+
*/
42+
private JsonObject rawObject;
43+
44+
/**
45+
* The serializer
46+
*/
47+
private ISerializer serializer;
48+
49+
/**
50+
* Gets the raw representation of this class
51+
*
52+
* @return the raw representation of this class
53+
*/
54+
public JsonObject getRawObject() {
55+
return rawObject;
56+
}
57+
58+
/**
59+
* Gets serializer
60+
*
61+
* @return the serializer
62+
*/
63+
protected ISerializer getSerializer() {
64+
return serializer;
65+
}
66+
67+
/**
68+
* Sets the raw JSON object
69+
*
70+
* @param serializer the serializer
71+
* @param json the JSON object to set this object to
72+
*/
73+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
74+
this.serializer = serializer;
75+
rawObject = json;
76+
77+
}
78+
}
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.concurrency.*;
7+
import com.microsoft.graph.core.*;
8+
import com.microsoft.graph.http.*;
9+
import com.microsoft.graph.options.*;
10+
import com.microsoft.graph.serializer.*;
11+
import java.util.Arrays;
12+
import java.util.EnumSet;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.JsonElement;
17+
import com.google.gson.annotations.*;
18+
import java.util.HashMap;
19+
import java.util.Map;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Audio Conferencing.
25+
*/
26+
public class AudioConferencing implements IJsonBackedObject {
27+
28+
@SerializedName("@odata.type")
29+
@Expose
30+
public String oDataType;
31+
32+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
33+
34+
@Override
35+
public final AdditionalDataManager additionalDataManager() {
36+
return additionalDataManager;
37+
}
38+
39+
/**
40+
* The Conference Id.
41+
*
42+
*/
43+
@SerializedName("conferenceId")
44+
@Expose
45+
public String conferenceId;
46+
47+
/**
48+
* The Toll Number.
49+
*
50+
*/
51+
@SerializedName("tollNumber")
52+
@Expose
53+
public String tollNumber;
54+
55+
/**
56+
* The Toll Free Number.
57+
*
58+
*/
59+
@SerializedName("tollFreeNumber")
60+
@Expose
61+
public String tollFreeNumber;
62+
63+
/**
64+
* The Dialin Url.
65+
*
66+
*/
67+
@SerializedName("dialinUrl")
68+
@Expose
69+
public String dialinUrl;
70+
71+
72+
/**
73+
* The raw representation of this class
74+
*/
75+
private JsonObject rawObject;
76+
77+
/**
78+
* The serializer
79+
*/
80+
private ISerializer serializer;
81+
82+
/**
83+
* Gets the raw representation of this class
84+
*
85+
* @return the raw representation of this class
86+
*/
87+
public JsonObject getRawObject() {
88+
return rawObject;
89+
}
90+
91+
/**
92+
* Gets serializer
93+
*
94+
* @return the serializer
95+
*/
96+
protected ISerializer getSerializer() {
97+
return serializer;
98+
}
99+
100+
/**
101+
* Sets the raw JSON object
102+
*
103+
* @param serializer the serializer
104+
* @param json the JSON object to set this object to
105+
*/
106+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
107+
this.serializer = serializer;
108+
rawObject = json;
109+
110+
}
111+
}

src/main/java/com/microsoft/graph/models/extensions/Calendar.java

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
import java.util.EnumSet;
1313
import com.microsoft.graph.models.generated.CalendarColor;
1414
import com.microsoft.graph.models.extensions.EmailAddress;
15-
import com.microsoft.graph.models.extensions.Event;
1615
import com.microsoft.graph.models.extensions.SingleValueLegacyExtendedProperty;
1716
import com.microsoft.graph.models.extensions.MultiValueLegacyExtendedProperty;
17+
import com.microsoft.graph.models.extensions.Event;
1818
import com.microsoft.graph.models.extensions.Entity;
19-
import com.microsoft.graph.requests.extensions.EventCollectionResponse;
20-
import com.microsoft.graph.requests.extensions.EventCollectionPage;
2119
import com.microsoft.graph.requests.extensions.SingleValueLegacyExtendedPropertyCollectionResponse;
2220
import com.microsoft.graph.requests.extensions.SingleValueLegacyExtendedPropertyCollectionPage;
2321
import com.microsoft.graph.requests.extensions.MultiValueLegacyExtendedPropertyCollectionResponse;
2422
import com.microsoft.graph.requests.extensions.MultiValueLegacyExtendedPropertyCollectionPage;
23+
import com.microsoft.graph.requests.extensions.EventCollectionResponse;
24+
import com.microsoft.graph.requests.extensions.EventCollectionPage;
2525

2626

2727
import com.google.gson.JsonObject;
@@ -94,18 +94,6 @@ public class Calendar extends Entity implements IJsonBackedObject {
9494
@Expose
9595
public EmailAddress owner;
9696

97-
/**
98-
* The Events.
99-
* The events in the calendar. Navigation property. Read-only.
100-
*/
101-
public EventCollectionPage events;
102-
103-
/**
104-
* The Calendar View.
105-
* The calendar view for the calendar. Navigation property. Read-only.
106-
*/
107-
public EventCollectionPage calendarView;
108-
10997
/**
11098
* The Single Value Extended Properties.
11199
* The collection of single-value extended properties defined for the calendar. Read-only. Nullable.
@@ -118,6 +106,18 @@ public class Calendar extends Entity implements IJsonBackedObject {
118106
*/
119107
public MultiValueLegacyExtendedPropertyCollectionPage multiValueExtendedProperties;
120108

109+
/**
110+
* The Events.
111+
* The events in the calendar. Navigation property. Read-only.
112+
*/
113+
public EventCollectionPage events;
114+
115+
/**
116+
* The Calendar View.
117+
* The calendar view for the calendar. Navigation property. Read-only.
118+
*/
119+
public EventCollectionPage calendarView;
120+
121121

122122
/**
123123
* The raw representation of this class
@@ -158,38 +158,6 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
158158
rawObject = json;
159159

160160

161-
if (json.has("events")) {
162-
final EventCollectionResponse response = new EventCollectionResponse();
163-
if (json.has("[email protected]")) {
164-
response.nextLink = json.get("[email protected]").getAsString();
165-
}
166-
167-
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("events").toString(), JsonObject[].class);
168-
final Event[] array = new Event[sourceArray.length];
169-
for (int i = 0; i < sourceArray.length; i++) {
170-
array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
171-
array[i].setRawObject(serializer, sourceArray[i]);
172-
}
173-
response.value = Arrays.asList(array);
174-
events = new EventCollectionPage(response, null);
175-
}
176-
177-
if (json.has("calendarView")) {
178-
final EventCollectionResponse response = new EventCollectionResponse();
179-
if (json.has("[email protected]")) {
180-
response.nextLink = json.get("[email protected]").getAsString();
181-
}
182-
183-
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("calendarView").toString(), JsonObject[].class);
184-
final Event[] array = new Event[sourceArray.length];
185-
for (int i = 0; i < sourceArray.length; i++) {
186-
array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
187-
array[i].setRawObject(serializer, sourceArray[i]);
188-
}
189-
response.value = Arrays.asList(array);
190-
calendarView = new EventCollectionPage(response, null);
191-
}
192-
193161
if (json.has("singleValueExtendedProperties")) {
194162
final SingleValueLegacyExtendedPropertyCollectionResponse response = new SingleValueLegacyExtendedPropertyCollectionResponse();
195163
if (json.has("[email protected]")) {
@@ -221,5 +189,37 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
221189
response.value = Arrays.asList(array);
222190
multiValueExtendedProperties = new MultiValueLegacyExtendedPropertyCollectionPage(response, null);
223191
}
192+
193+
if (json.has("events")) {
194+
final EventCollectionResponse response = new EventCollectionResponse();
195+
if (json.has("[email protected]")) {
196+
response.nextLink = json.get("[email protected]").getAsString();
197+
}
198+
199+
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("events").toString(), JsonObject[].class);
200+
final Event[] array = new Event[sourceArray.length];
201+
for (int i = 0; i < sourceArray.length; i++) {
202+
array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
203+
array[i].setRawObject(serializer, sourceArray[i]);
204+
}
205+
response.value = Arrays.asList(array);
206+
events = new EventCollectionPage(response, null);
207+
}
208+
209+
if (json.has("calendarView")) {
210+
final EventCollectionResponse response = new EventCollectionResponse();
211+
if (json.has("[email protected]")) {
212+
response.nextLink = json.get("[email protected]").getAsString();
213+
}
214+
215+
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("calendarView").toString(), JsonObject[].class);
216+
final Event[] array = new Event[sourceArray.length];
217+
for (int i = 0; i < sourceArray.length; i++) {
218+
array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
219+
array[i].setRawObject(serializer, sourceArray[i]);
220+
}
221+
response.value = Arrays.asList(array);
222+
calendarView = new EventCollectionPage(response, null);
223+
}
224224
}
225225
}

0 commit comments

Comments
 (0)