Skip to content

Commit 9472f99

Browse files
baywetbaywet
authored
Merge pull request #658 from microsoftgraph/v1.0/pipelinebuild/39906
Generated v1.0 models and request builders using Typewriter
2 parents ee1678b + ed133a9 commit 9472f99

387 files changed

Lines changed: 18727 additions & 2941 deletions

File tree

Some content is hidden

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

‎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:2.7.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:2.7.1'
2323
}
2424
```
2525

@@ -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.7.0</version>
34+
<version>2.7.1</version>
3535
</dependency>
3636
```
3737

@@ -118,3 +118,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
118118

119119

120120

121+

‎gradle.properties‎

Lines changed: 2 additions & 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 = 7
30-
mavenPatchVersion = 0
30+
mavenPatchVersion = 1
3131
mavenArtifactSuffix =
3232

3333
#These values are used to run functional tests
@@ -44,3 +44,4 @@ mavenCentralPublishingEnabled=false
4444

4545

4646

47+

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public final class Constants {
44
private Constants() {
55
}
6-
6+
77
public static final String APPROOT = "approot";
88
/**
99
* The content type header
@@ -18,20 +18,21 @@ private Constants() {
1818
*/
1919
public static final String JSON_CONTENT_TYPE = "application/json";
2020
/**
21-
* The binary content type header's value
21+
* The binary content type header's value
2222
*/
2323
public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
24-
24+
2525
// Constants for functional tests
26-
// TO-DO: document how to register an application for functional
26+
// TO-DO: document how to register an application for functional
2727
// testing purposes
2828
public static final String APPID = "app-id";
2929
public static final String USERNAME = "user@email.com";
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.7.0";
33+
public static final String VERSION_NAME = "2.7.1";
3434
}
3535

3636

3737

38+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {
284284

285285
/**
286286
* The Owners.
287-
* Directory objects that are owners of the application. The owners are a set of non-admin users who are allowed to modify this object. Requires version 2013-11-08 or newer. Read-only. Nullable.
287+
* Directory objects that are owners of the application. Read-only. Nullable.
288288
*/
289289
public DirectoryObjectCollectionPage owners;
290290

‎src/main/java/com/microsoft/graph/models/extensions/Authentication.java‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
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.models.extensions;
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.models.extensions.Fido2AuthenticationMethod;
12+
import com.microsoft.graph.models.extensions.AuthenticationMethod;
13+
import com.microsoft.graph.models.extensions.MicrosoftAuthenticatorAuthenticationMethod;
14+
import com.microsoft.graph.models.extensions.WindowsHelloForBusinessAuthenticationMethod;
15+
import com.microsoft.graph.models.extensions.Entity;
16+
import com.microsoft.graph.requests.extensions.Fido2AuthenticationMethodCollectionPage;
17+
import com.microsoft.graph.requests.extensions.AuthenticationMethodCollectionPage;
18+
import com.microsoft.graph.requests.extensions.MicrosoftAuthenticatorAuthenticationMethodCollectionPage;
19+
import com.microsoft.graph.requests.extensions.WindowsHelloForBusinessAuthenticationMethodCollectionPage;
20+
21+
22+
import com.google.gson.JsonObject;
23+
import com.google.gson.annotations.SerializedName;
24+
import com.google.gson.annotations.Expose;
25+
26+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
27+
28+
/**
29+
* The class for the Authentication.
30+
*/
31+
public class Authentication extends Entity implements IJsonBackedObject {
32+
33+
34+
/**
35+
* The Fido2Methods.
36+
*
37+
*/
38+
@SerializedName(value = "fido2Methods", alternate = {"Fido2Methods"})
39+
@Expose
40+
public Fido2AuthenticationMethodCollectionPage fido2Methods;
41+
42+
/**
43+
* The Methods.
44+
*
45+
*/
46+
@SerializedName(value = "methods", alternate = {"Methods"})
47+
@Expose
48+
public AuthenticationMethodCollectionPage methods;
49+
50+
/**
51+
* The Microsoft Authenticator Methods.
52+
*
53+
*/
54+
@SerializedName(value = "microsoftAuthenticatorMethods", alternate = {"MicrosoftAuthenticatorMethods"})
55+
@Expose
56+
public MicrosoftAuthenticatorAuthenticationMethodCollectionPage microsoftAuthenticatorMethods;
57+
58+
/**
59+
* The Windows Hello For Business Methods.
60+
*
61+
*/
62+
@SerializedName(value = "windowsHelloForBusinessMethods", alternate = {"WindowsHelloForBusinessMethods"})
63+
@Expose
64+
public WindowsHelloForBusinessAuthenticationMethodCollectionPage windowsHelloForBusinessMethods;
65+
66+
67+
/**
68+
* The raw representation of this class
69+
*/
70+
private JsonObject rawObject;
71+
72+
/**
73+
* The serializer
74+
*/
75+
private ISerializer serializer;
76+
77+
/**
78+
* Gets the raw representation of this class
79+
*
80+
* @return the raw representation of this class
81+
*/
82+
public JsonObject getRawObject() {
83+
return rawObject;
84+
}
85+
86+
/**
87+
* Gets serializer
88+
*
89+
* @return the serializer
90+
*/
91+
protected ISerializer getSerializer() {
92+
return serializer;
93+
}
94+
95+
/**
96+
* Sets the raw JSON object
97+
*
98+
* @param serializer the serializer
99+
* @param json the JSON object to set this object to
100+
*/
101+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
102+
this.serializer = serializer;
103+
rawObject = json;
104+
105+
106+
if (json.has("fido2Methods")) {
107+
fido2Methods = serializer.deserializeObject(json.get("fido2Methods").toString(), Fido2AuthenticationMethodCollectionPage.class);
108+
}
109+
110+
if (json.has("methods")) {
111+
methods = serializer.deserializeObject(json.get("methods").toString(), AuthenticationMethodCollectionPage.class);
112+
}
113+
114+
if (json.has("microsoftAuthenticatorMethods")) {
115+
microsoftAuthenticatorMethods = serializer.deserializeObject(json.get("microsoftAuthenticatorMethods").toString(), MicrosoftAuthenticatorAuthenticationMethodCollectionPage.class);
116+
}
117+
118+
if (json.has("windowsHelloForBusinessMethods")) {
119+
windowsHelloForBusinessMethods = serializer.deserializeObject(json.get("windowsHelloForBusinessMethods").toString(), WindowsHelloForBusinessAuthenticationMethodCollectionPage.class);
120+
}
121+
}
122+
}

‎src/main/java/com/microsoft/graph/models/extensions/AuthenticationMethod.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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.models.extensions;
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.models.extensions.Entity;
12+
13+
14+
import com.google.gson.JsonObject;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
18+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
19+
20+
/**
21+
* The class for the Authentication Method.
22+
*/
23+
public class AuthenticationMethod extends Entity implements IJsonBackedObject {
24+
25+
26+
27+
/**
28+
* The raw representation of this class
29+
*/
30+
private JsonObject rawObject;
31+
32+
/**
33+
* The serializer
34+
*/
35+
private ISerializer serializer;
36+
37+
/**
38+
* Gets the raw representation of this class
39+
*
40+
* @return the raw representation of this class
41+
*/
42+
public JsonObject getRawObject() {
43+
return rawObject;
44+
}
45+
46+
/**
47+
* Gets serializer
48+
*
49+
* @return the serializer
50+
*/
51+
protected ISerializer getSerializer() {
52+
return serializer;
53+
}
54+
55+
/**
56+
* Sets the raw JSON object
57+
*
58+
* @param serializer the serializer
59+
* @param json the JSON object to set this object to
60+
*/
61+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
62+
this.serializer = serializer;
63+
rawObject = json;
64+
65+
}
66+
}

‎src/main/java/com/microsoft/graph/models/extensions/AuthenticationMethodConfiguration.java‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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.models.extensions;
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.models.generated.AuthenticationMethodState;
12+
import com.microsoft.graph.models.extensions.Entity;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
19+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
20+
21+
/**
22+
* The class for the Authentication Method Configuration.
23+
*/
24+
public class AuthenticationMethodConfiguration extends Entity implements IJsonBackedObject {
25+
26+
27+
/**
28+
* The State.
29+
*
30+
*/
31+
@SerializedName(value = "state", alternate = {"State"})
32+
@Expose
33+
public AuthenticationMethodState state;
34+
35+
36+
/**
37+
* The raw representation of this class
38+
*/
39+
private JsonObject rawObject;
40+
41+
/**
42+
* The serializer
43+
*/
44+
private ISerializer serializer;
45+
46+
/**
47+
* Gets the raw representation of this class
48+
*
49+
* @return the raw representation of this class
50+
*/
51+
public JsonObject getRawObject() {
52+
return rawObject;
53+
}
54+
55+
/**
56+
* Gets serializer
57+
*
58+
* @return the serializer
59+
*/
60+
protected ISerializer getSerializer() {
61+
return serializer;
62+
}
63+
64+
/**
65+
* Sets the raw JSON object
66+
*
67+
* @param serializer the serializer
68+
* @param json the JSON object to set this object to
69+
*/
70+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
71+
this.serializer = serializer;
72+
rawObject = json;
73+
74+
}
75+
}

0 commit comments

Comments
 (0)