Skip to content

Commit 4086d10

Browse files
committed
Merge branch 'dev' into bugfix/profile-photo-cast
2 parents f1d7545 + dd7778c commit 4086d10

File tree

106 files changed

+952
-56
lines changed

Some content is hidden

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

106 files changed

+952
-56
lines changed

src/main/java/com/microsoft/graph/callrecords/models/extensions/CallRecord.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ public class CallRecord extends Entity implements IJsonBackedObject {
108108
* The Sessions.
109109
* List of sessions involved in the call. Peer-to-peer calls typically only have one session, whereas group calls typically have at least one session per participant. Read-only. Nullable.
110110
*/
111+
@SerializedName("sessions")
112+
@Expose
111113
public SessionCollectionPage sessions;
112114

113115

src/main/java/com/microsoft/graph/callrecords/models/extensions/Session.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ public class Session extends Entity implements IJsonBackedObject {
8484
* The Segments.
8585
* The list of segments involved in the session. Read-only. Nullable.
8686
*/
87+
@SerializedName("segments")
88+
@Expose
8789
public SegmentCollectionPage segments;
8890

8991

src/main/java/com/microsoft/graph/core/Constants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ private Constants() {
2828
public static final String APPID = "app-id";
2929
public static final String USERNAME = "[email protected]";
3030
public static final String PASSWORD = "password";
31+
public static final String TENANTID = "tenantid";
32+
public static final String CLIENTSECRET = "clientsecret";
3133
public static final String VERSION_NAME = "2.0.0";
3234
}

src/main/java/com/microsoft/graph/core/DefaultConnectionConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void setReadTimeout(int readTimeoutValue) {
110110
* @param maxRedirects Max redirects that a request can take
111111
*/
112112
public void setMaxRedirects(int maxRedirects) {
113-
this.maxRedirects = maxRedirects;
113+
DefaultConnectionConfig.maxRedirects = maxRedirects;
114114
}
115115

116116
/**
@@ -128,7 +128,7 @@ public int getMaxRedirects() {
128128
* @param shouldRedirect Callback called before doing a redirect
129129
*/
130130
public void setShouldRedirect(IShouldRedirect shouldRedirect) {
131-
this.shouldRedirect = shouldRedirect;
131+
DefaultConnectionConfig.shouldRedirect = shouldRedirect;
132132
}
133133

134134
/**
@@ -146,7 +146,7 @@ public IShouldRedirect getShouldRedirect() {
146146
* @param shouldretry The callback called before retry
147147
*/
148148
public void setShouldRetry(IShouldRetry shouldretry) {
149-
this.shouldRetry = shouldretry;
149+
DefaultConnectionConfig.shouldRetry = shouldretry;
150150
}
151151

152152
/**
@@ -164,7 +164,7 @@ public IShouldRetry getShouldRetry() {
164164
* @param maxRetries Max retries for a request
165165
*/
166166
public void setMaxRetries(int maxRetries) {
167-
this.maxRetries = maxRetries;
167+
DefaultConnectionConfig.maxRetries = maxRetries;
168168
}
169169

170170
/**
@@ -182,7 +182,7 @@ public int getMaxRetries() {
182182
* @param delay Delay in seconds between retries
183183
*/
184184
public void setDelay(long delay) {
185-
this.delay = delay;
185+
DefaultConnectionConfig.delay = delay;
186186
}
187187

188188
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ public class AndroidManagedAppProtection extends TargetedManagedAppProtection im
9898
* The Apps.
9999
* List of apps to which the policy is deployed.
100100
*/
101+
@SerializedName("apps")
102+
@Expose
101103
public ManagedMobileAppCollectionPage apps;
102104

103105
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public class AppCatalogs extends Entity implements IJsonBackedObject {
3333
* The Teams Apps.
3434
*
3535
*/
36+
@SerializedName("teamsApps")
37+
@Expose
3638
public TeamsAppCollectionPage teamsApps;
3739

3840

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
271271
* The Extension Properties.
272272
* Read-only. Nullable.
273273
*/
274+
@SerializedName("extensionProperties")
275+
@Expose
274276
public ExtensionPropertyCollectionPage extensionProperties;
275277

276278
/**

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,24 @@ public class AuditLogRoot extends Entity implements IJsonBackedObject {
3939
* The Directory Audits.
4040
* Read-only. Nullable.
4141
*/
42+
@SerializedName("directoryAudits")
43+
@Expose
4244
public DirectoryAuditCollectionPage directoryAudits;
4345

4446
/**
4547
* The Restricted Sign Ins.
4648
*
4749
*/
50+
@SerializedName("restrictedSignIns")
51+
@Expose
4852
public RestrictedSignInCollectionPage restrictedSignIns;
4953

5054
/**
5155
* The Sign Ins.
5256
* Read-only. Nullable.
5357
*/
58+
@SerializedName("signIns")
59+
@Expose
5460
public SignInCollectionPage signIns;
5561

5662

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,30 +133,40 @@ public class Calendar extends Entity implements IJsonBackedObject {
133133
* The Calendar Permissions.
134134
* The permissions of the users with whom the calendar is shared.
135135
*/
136+
@SerializedName("calendarPermissions")
137+
@Expose
136138
public CalendarPermissionCollectionPage calendarPermissions;
137139

138140
/**
139141
* The Calendar View.
140142
* The calendar view for the calendar. Navigation property. Read-only.
141143
*/
144+
@SerializedName("calendarView")
145+
@Expose
142146
public EventCollectionPage calendarView;
143147

144148
/**
145149
* The Events.
146150
* The events in the calendar. Navigation property. Read-only.
147151
*/
152+
@SerializedName("events")
153+
@Expose
148154
public EventCollectionPage events;
149155

150156
/**
151157
* The Multi Value Extended Properties.
152158
* The collection of multi-value extended properties defined for the calendar. Read-only. Nullable.
153159
*/
160+
@SerializedName("multiValueExtendedProperties")
161+
@Expose
154162
public MultiValueLegacyExtendedPropertyCollectionPage multiValueExtendedProperties;
155163

156164
/**
157165
* The Single Value Extended Properties.
158166
* The collection of single-value extended properties defined for the calendar. Read-only. Nullable.
159167
*/
168+
@SerializedName("singleValueExtendedProperties")
169+
@Expose
160170
public SingleValueLegacyExtendedPropertyCollectionPage singleValueExtendedProperties;
161171

162172

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public class CalendarGroup extends Entity implements IJsonBackedObject {
5757
* The Calendars.
5858
* The calendars in the calendar group. Navigation property. Read-only. Nullable.
5959
*/
60+
@SerializedName("calendars")
61+
@Expose
6062
public CalendarCollectionPage calendars;
6163

6264

0 commit comments

Comments
 (0)