Skip to content

Commit 2c6e507

Browse files
authored
Merge pull request #551 from microsoftgraph/v1.0/pipelinebuild/3946670
Generated v1.0 models and request builders using Typewriter
2 parents a46980e + 85e1354 commit 2c6e507

File tree

102 files changed

+5246
-24
lines changed

Some content is hidden

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

102 files changed

+5246
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
3131
<dependency>
3232
<groupId>com.microsoft.graph</groupId>
3333
<artifactId>microsoft-graph</artifactId>
34-
<version>2.3.1</version>
34+
<version>2.3.2</version>
3535
</dependency>
3636
```
3737

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
2828
mavenMajorVersion = 2
2929
mavenMinorVersion = 3
30-
mavenPatchVersion = 1
30+
mavenPatchVersion = 2
3131
mavenArtifactSuffix =
3232
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ private Constants() {
3030
public static final String PASSWORD = "password";
3131
public static final String TENANTID = "tenantid";
3232
public static final String CLIENTSECRET = "clientsecret";
33-
public static final String VERSION_NAME = "2.3.1";
33+
public static final String VERSION_NAME = "2.3.2";
3434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class AdministrativeUnit extends DirectoryObject implements IJsonBackedOb
4545

4646
/**
4747
* The Visibility.
48-
* Controls whether the adminstrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
48+
* Controls whether the administrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
4949
*/
5050
@SerializedName(value = "visibility", alternate = {"Visibility"})
5151
@Expose

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ public class Calendar extends Entity implements IJsonBackedObject {
9797
@Expose
9898
public String hexColor;
9999

100+
/**
101+
* The Is Default Calendar.
102+
*
103+
*/
104+
@SerializedName(value = "isDefaultCalendar", alternate = {"IsDefaultCalendar"})
105+
@Expose
106+
public Boolean isDefaultCalendar;
107+
100108
/**
101109
* The Is Removable.
102110
* Indicates whether this user calendar can be deleted from the user mailbox.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public final AdditionalDataManager additionalDataManager() {
6969

7070
/**
7171
* The Lifecycle Event.
72-
*
72+
* The type of lifecycle notification if the current notification is a lifecycle notification. Optional. Supported values are missed, removed, reauthorizationRequired.
7373
*/
7474
@SerializedName(value = "lifecycleEvent", alternate = {"LifecycleEvent"})
7575
@Expose

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ public class Device extends DirectoryObject implements IJsonBackedObject {
6868

6969
/**
7070
* The Device Metadata.
71-
* For interal use only. Set to null.
71+
* For internal use only. Set to null.
7272
*/
7373
@SerializedName(value = "deviceMetadata", alternate = {"DeviceMetadata"})
7474
@Expose
7575
public String deviceMetadata;
7676

7777
/**
7878
* The Device Version.
79-
* For interal use only.
79+
* For internal use only.
8080
*/
8181
@SerializedName(value = "deviceVersion", alternate = {"DeviceVersion"})
8282
@Expose
@@ -116,7 +116,7 @@ public class Device extends DirectoryObject implements IJsonBackedObject {
116116

117117
/**
118118
* The On Premises Last Sync Date Time.
119-
* The last time at which the object was synced with the on-premises directory.The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z' Read-only.
119+
* The last time at which the object was synced with the on-premises directory. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z' Read-only.
120120
*/
121121
@SerializedName(value = "onPremisesLastSyncDateTime", alternate = {"OnPremisesLastSyncDateTime"})
122122
@Expose
@@ -148,7 +148,7 @@ public class Device extends DirectoryObject implements IJsonBackedObject {
148148

149149
/**
150150
* The Physical Ids.
151-
* For interal use only. Not nullable.
151+
* For internal use only. Not nullable.
152152
*/
153153
@SerializedName(value = "physicalIds", alternate = {"PhysicalIds"})
154154
@Expose
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
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.serializer.ISerializer;
7+
import com.microsoft.graph.serializer.IJsonBackedObject;
8+
import com.microsoft.graph.serializer.AdditionalDataManager;
9+
import java.util.EnumSet;
10+
import com.microsoft.graph.models.extensions.Entity;
11+
12+
13+
import com.google.gson.JsonObject;
14+
import com.google.gson.annotations.SerializedName;
15+
import com.google.gson.annotations.Expose;
16+
17+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
18+
19+
/**
20+
* The class for the Linked Resource.
21+
*/
22+
public class LinkedResource extends Entity implements IJsonBackedObject {
23+
24+
25+
/**
26+
* The Application Name.
27+
*
28+
*/
29+
@SerializedName(value = "applicationName", alternate = {"ApplicationName"})
30+
@Expose
31+
public String applicationName;
32+
33+
/**
34+
* The Display Name.
35+
*
36+
*/
37+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
38+
@Expose
39+
public String displayName;
40+
41+
/**
42+
* The External Id.
43+
*
44+
*/
45+
@SerializedName(value = "externalId", alternate = {"ExternalId"})
46+
@Expose
47+
public String externalId;
48+
49+
/**
50+
* The Web Url.
51+
*
52+
*/
53+
@SerializedName(value = "webUrl", alternate = {"WebUrl"})
54+
@Expose
55+
public String webUrl;
56+
57+
58+
/**
59+
* The raw representation of this class
60+
*/
61+
private JsonObject rawObject;
62+
63+
/**
64+
* The serializer
65+
*/
66+
private ISerializer serializer;
67+
68+
/**
69+
* Gets the raw representation of this class
70+
*
71+
* @return the raw representation of this class
72+
*/
73+
public JsonObject getRawObject() {
74+
return rawObject;
75+
}
76+
77+
/**
78+
* Gets serializer
79+
*
80+
* @return the serializer
81+
*/
82+
protected ISerializer getSerializer() {
83+
return serializer;
84+
}
85+
86+
/**
87+
* Sets the raw JSON object
88+
*
89+
* @param serializer the serializer
90+
* @param json the JSON object to set this object to
91+
*/
92+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
93+
this.serializer = serializer;
94+
rawObject = json;
95+
96+
}
97+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public class Message extends OutlookItem implements IJsonBackedObject {
238238

239239
/**
240240
* The Web Link.
241-
* The URL to open the message in Outlook Web App.You can append an ispopout argument to the end of the URL to change how the message is displayed. If ispopout is not present or if it is set to 1, then the message is shown in a popout window. If ispopout is set to 0, then the browser will show the message in the Outlook Web App review pane.The message will open in the browser if you are logged in to your mailbox via Outlook Web App. You will be prompted to login if you are not already logged in with the browser.This URL can be accessed from within an iFrame.
241+
* The URL to open the message in Outlook on the web.You can append an ispopout argument to the end of the URL to change how the message is displayed. If ispopout is not present or if it is set to 1, then the message is shown in a popout window. If ispopout is set to 0, then the browser will show the message in the Outlook on the web review pane.The message will open in the browser if you are logged in to your mailbox via Outlook on the web. You will be prompted to login if you are not already logged in with the browser.This URL cannot be accessed from within an iFrame.
242242
*/
243243
@SerializedName(value = "webLink", alternate = {"WebLink"})
244244
@Expose

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.microsoft.graph.models.extensions.AppRoleAssignment;
1818
import com.microsoft.graph.models.extensions.ClaimsMappingPolicy;
1919
import com.microsoft.graph.models.extensions.DirectoryObject;
20+
import com.microsoft.graph.models.extensions.DelegatedPermissionClassification;
2021
import com.microsoft.graph.models.extensions.Endpoint;
2122
import com.microsoft.graph.models.extensions.HomeRealmDiscoveryPolicy;
2223
import com.microsoft.graph.models.extensions.OAuth2PermissionGrant;
@@ -25,6 +26,7 @@
2526
import com.microsoft.graph.requests.extensions.AppRoleAssignmentCollectionPage;
2627
import com.microsoft.graph.requests.extensions.ClaimsMappingPolicyCollectionPage;
2728
import com.microsoft.graph.requests.extensions.DirectoryObjectCollectionPage;
29+
import com.microsoft.graph.requests.extensions.DelegatedPermissionClassificationCollectionPage;
2830
import com.microsoft.graph.requests.extensions.EndpointCollectionPage;
2931
import com.microsoft.graph.requests.extensions.HomeRealmDiscoveryPolicyCollectionPage;
3032
import com.microsoft.graph.requests.extensions.OAuth2PermissionGrantCollectionPage;
@@ -304,6 +306,14 @@ public class ServicePrincipal extends DirectoryObject implements IJsonBackedObje
304306
*/
305307
public DirectoryObjectCollectionPage createdObjects;
306308

309+
/**
310+
* The Delegated Permission Classifications.
311+
*
312+
*/
313+
@SerializedName(value = "delegatedPermissionClassifications", alternate = {"DelegatedPermissionClassifications"})
314+
@Expose
315+
public DelegatedPermissionClassificationCollectionPage delegatedPermissionClassifications;
316+
307317
/**
308318
* The Endpoints.
309319
* Endpoints available for discovery. Services like Sharepoint populate this property with a tenant specific SharePoint endpoints that other applications can discover and use in their experiences.
@@ -416,6 +426,10 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
416426
createdObjects = serializer.deserializeObject(json.get("createdObjects").toString(), DirectoryObjectCollectionPage.class);
417427
}
418428

429+
if (json.has("delegatedPermissionClassifications")) {
430+
delegatedPermissionClassifications = serializer.deserializeObject(json.get("delegatedPermissionClassifications").toString(), DelegatedPermissionClassificationCollectionPage.class);
431+
}
432+
419433
if (json.has("endpoints")) {
420434
endpoints = serializer.deserializeObject(json.get("endpoints").toString(), EndpointCollectionPage.class);
421435
}

0 commit comments

Comments
 (0)