Skip to content

Commit 10bf791

Browse files
Merge pull request #142 from microsoftgraph/beta/pipelinebuild/54101
Generated beta models and request builders using Typewriter
2 parents 9645741 + f0a0d8f commit 10bf791

File tree

13 files changed

+158
-14
lines changed

13 files changed

+158
-14
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
2020
dependencies {
2121
// Include the sdk as a dependency
22-
implementation 'com.microsoft.graph:microsoft-graph-beta:0.22.0-SNAPSHOT'
22+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.23.0-SNAPSHOT'
2323
// Uncomment the line below if you are building an android application
2424
//implementation 'com.google.guava:guava:30.1.1-android'
2525
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
3636
<!-- Include the sdk as a dependency -->
3737
<groupId>com.microsoft.graph</groupId>
3838
<artifactId>microsoft-graph-beta</artifactId>
39-
<version>0.22.0-SNAPSHOT</version>
39+
<version>0.23.0-SNAPSHOT</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -162,3 +162,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
162162

163163

164164

165+

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ org.gradle.caching=true
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph-beta
2828
mavenMajorVersion = 0
29-
mavenMinorVersion = 22
29+
mavenMinorVersion = 23
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -60,4 +60,5 @@ mavenCentralPublishingEnabled=false
6060

6161

6262

63+
6364

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// Template Source: BaseEntity.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.externalconnectors.models;
7+
import com.microsoft.graph.serializer.ISerializer;
8+
import com.microsoft.graph.serializer.IJsonBackedObject;
9+
import com.microsoft.graph.serializer.AdditionalDataManager;
10+
import java.util.EnumSet;
11+
import com.microsoft.graph.externalconnectors.models.IdentityType;
12+
13+
14+
import com.google.gson.JsonObject;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
import javax.annotation.Nullable;
18+
import javax.annotation.Nonnull;
19+
20+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
21+
22+
/**
23+
* The class for the Identity.
24+
*/
25+
public class Identity implements IJsonBackedObject {
26+
27+
/** the OData type of the object as returned by the service */
28+
@SerializedName("@odata.type")
29+
@Expose
30+
@Nullable
31+
public String oDataType;
32+
33+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
34+
35+
@Override
36+
@Nonnull
37+
public final AdditionalDataManager additionalDataManager() {
38+
return additionalDataManager;
39+
}
40+
41+
/**
42+
* The Id.
43+
*
44+
*/
45+
@SerializedName(value = "id", alternate = {"Id"})
46+
@Expose
47+
@Nullable
48+
public String id;
49+
50+
/**
51+
* The Type.
52+
*
53+
*/
54+
@SerializedName(value = "type", alternate = {"Type"})
55+
@Expose
56+
@Nullable
57+
public IdentityType type;
58+
59+
60+
/**
61+
* Sets the raw JSON object
62+
*
63+
* @param serializer the serializer
64+
* @param json the JSON object to set this object to
65+
*/
66+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
67+
68+
}
69+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Template Source: Enum.java.tt
2+
// ------------------------------------------------------------------------------
3+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
4+
// ------------------------------------------------------------------------------
5+
6+
package com.microsoft.graph.externalconnectors.models;
7+
8+
9+
/**
10+
* The Enum Identity Type.
11+
*/
12+
public enum IdentityType
13+
{
14+
/**
15+
* user
16+
*/
17+
USER,
18+
/**
19+
* group
20+
*/
21+
GROUP,
22+
/**
23+
* external Group
24+
*/
25+
EXTERNAL_GROUP,
26+
/**
27+
* unknown Future Value
28+
*/
29+
UNKNOWN_FUTURE_VALUE,
30+
/**
31+
* For IdentityType values that were not expected from the service
32+
*/
33+
UNEXPECTED_VALUE
34+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private Constants() {
1818
/** The client secret to use for unit testing */
1919
public static final String CLIENTSECRET = "clientsecret";
2020
/** The SDK version */
21-
public static final String VERSION_NAME = "0.22.0";
21+
public static final String VERSION_NAME = "0.23.0";
2222
}
2323

2424

@@ -36,3 +36,4 @@ private Constants() {
3636

3737

3838

39+

src/main/java/com/microsoft/graph/models/AccessPackageAssignmentRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public class AccessPackageAssignmentRequest extends Entity implements IJsonBacke
8787

8888
/**
8989
* The Request State.
90-
* One of PendingApproval, Canceled, Denied, Delivering, Delivered, PartiallyDelivered, Submitted or Scheduled. Read-only.
90+
* One of PendingApproval, Canceled, Denied, Delivering, Delivered, PartiallyDelivered, DeliveryFailed, Submitted or Scheduled. Read-only.
9191
*/
9292
@SerializedName(value = "requestState", alternate = {"RequestState"})
9393
@Expose

src/main/java/com/microsoft/graph/models/ChatMessageInfo.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.ItemBody;
12+
import com.microsoft.graph.models.EventMessageDetail;
1213
import com.microsoft.graph.models.ChatMessageFromIdentitySet;
14+
import com.microsoft.graph.models.ChatMessageType;
1315
import com.microsoft.graph.models.Entity;
1416

1517

@@ -45,6 +47,15 @@ public class ChatMessageInfo extends Entity implements IJsonBackedObject {
4547
@Nullable
4648
public java.time.OffsetDateTime createdDateTime;
4749

50+
/**
51+
* The Event Detail.
52+
*
53+
*/
54+
@SerializedName(value = "eventDetail", alternate = {"EventDetail"})
55+
@Expose
56+
@Nullable
57+
public EventMessageDetail eventDetail;
58+
4859
/**
4960
* The From.
5061
* Information about the sender of the message.
@@ -63,6 +74,15 @@ public class ChatMessageInfo extends Entity implements IJsonBackedObject {
6374
@Nullable
6475
public Boolean isDeleted;
6576

77+
/**
78+
* The Message Type.
79+
*
80+
*/
81+
@SerializedName(value = "messageType", alternate = {"MessageType"})
82+
@Expose
83+
@Nullable
84+
public ChatMessageType messageType;
85+
6686

6787
/**
6888
* Sets the raw JSON object

src/main/java/com/microsoft/graph/models/KeyCredential.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public final AdditionalDataManager additionalDataManager() {
5757

5858
/**
5959
* The End Date Time.
60-
* The date and time at which the credential expires.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 is 2014-01-01T00:00:00Z
60+
* The date and time at which the credential expires.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 is 2014-01-01T00:00:00Z.
6161
*/
6262
@SerializedName(value = "endDateTime", alternate = {"EndDateTime"})
6363
@Expose
@@ -75,7 +75,7 @@ public final AdditionalDataManager additionalDataManager() {
7575

7676
/**
7777
* The Key Id.
78-
* The unique identifier (GUID) for the key.
78+
* The unique identifier for the key.
7979
*/
8080
@SerializedName(value = "keyId", alternate = {"KeyId"})
8181
@Expose
@@ -84,7 +84,7 @@ public final AdditionalDataManager additionalDataManager() {
8484

8585
/**
8686
* The Start Date Time.
87-
* The date and time at which the credential becomes valid.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 is 2014-01-01T00:00:00Z
87+
* The date and time at which the credential becomes valid.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 is 2014-01-01T00:00:00Z.
8888
*/
8989
@SerializedName(value = "startDateTime", alternate = {"StartDateTime"})
9090
@Expose
@@ -93,7 +93,7 @@ public final AdditionalDataManager additionalDataManager() {
9393

9494
/**
9595
* The Type.
96-
* The type of key credential; for example, 'Symmetric'.
96+
* The type of key credential; for example, Symmetric.
9797
*/
9898
@SerializedName(value = "type", alternate = {"Type"})
9999
@Expose
@@ -102,7 +102,7 @@ public final AdditionalDataManager additionalDataManager() {
102102

103103
/**
104104
* The Usage.
105-
* A string that describes the purpose for which the key can be used; for example, 'Verify'.
105+
* A string that describes the purpose for which the key can be used; for example, Verify.
106106
*/
107107
@SerializedName(value = "usage", alternate = {"Usage"})
108108
@Expose

src/main/java/com/microsoft/graph/models/MembersAddedEventMessageDetail.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ public class MembersAddedEventMessageDetail extends EventMessageDetail implement
4646
@Nullable
4747
public java.util.List<TeamworkUserIdentity> members;
4848

49+
/**
50+
* The Visible History Start Date Time.
51+
*
52+
*/
53+
@SerializedName(value = "visibleHistoryStartDateTime", alternate = {"VisibleHistoryStartDateTime"})
54+
@Expose
55+
@Nullable
56+
public java.time.OffsetDateTime visibleHistoryStartDateTime;
57+
4958

5059
/**
5160
* Sets the raw JSON object

src/main/java/com/microsoft/graph/models/PolicyRoot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public final AdditionalDataManager additionalDataManager() {
110110

111111
/**
112112
* The App Management Policies.
113-
*
113+
* The policies that enforce app management restrictions for specific applications and service principals, overriding the defaultAppManagementPolicy.
114114
*/
115115
@SerializedName(value = "appManagementPolicies", alternate = {"AppManagementPolicies"})
116116
@Expose
@@ -137,7 +137,7 @@ public final AdditionalDataManager additionalDataManager() {
137137

138138
/**
139139
* The Default App Management Policy.
140-
*
140+
* The tenant-wide policy that enforces app management restrictions for all applications and service principals.
141141
*/
142142
@SerializedName(value = "defaultAppManagementPolicy", alternate = {"DefaultAppManagementPolicy"})
143143
@Expose

0 commit comments

Comments
 (0)