Skip to content

Commit 09fd840

Browse files
authored
Merge pull request #668 from microsoftgraph/v1.0/pipelinebuild/40826
Generated v1.0 models and request builders using Typewriter
2 parents 31121a7 + 4211300 commit 09fd840

28 files changed

+2225
-9
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:2.8.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:2.8.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.8.0</version>
34+
<version>2.8.1</version>
3535
</dependency>
3636
```
3737

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

121121

122122

123+

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 = 8
30-
mavenPatchVersion = 0
30+
mavenPatchVersion = 1
3131
mavenArtifactSuffix =
3232

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

4747

4848

49+

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ 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.8.0";
33+
public static final String VERSION_NAME = "2.8.1";
3434
}
3535

3636

3737

3838

3939

40+
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
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.Application;
12+
import com.microsoft.graph.models.extensions.ServicePrincipal;
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 Application Service Principal.
23+
*/
24+
public class ApplicationServicePrincipal implements IJsonBackedObject {
25+
26+
@SerializedName("@odata.type")
27+
@Expose
28+
public String oDataType;
29+
30+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
31+
32+
@Override
33+
public final AdditionalDataManager additionalDataManager() {
34+
return additionalDataManager;
35+
}
36+
37+
/**
38+
* The Application.
39+
*
40+
*/
41+
@SerializedName(value = "application", alternate = {"Application"})
42+
@Expose
43+
public Application application;
44+
45+
/**
46+
* The Service Principal.
47+
*
48+
*/
49+
@SerializedName(value = "servicePrincipal", alternate = {"ServicePrincipal"})
50+
@Expose
51+
public ServicePrincipal servicePrincipal;
52+
53+
54+
/**
55+
* The raw representation of this class
56+
*/
57+
private JsonObject rawObject;
58+
59+
/**
60+
* The serializer
61+
*/
62+
private ISerializer serializer;
63+
64+
/**
65+
* Gets the raw representation of this class
66+
*
67+
* @return the raw representation of this class
68+
*/
69+
public JsonObject getRawObject() {
70+
return rawObject;
71+
}
72+
73+
/**
74+
* Gets serializer
75+
*
76+
* @return the serializer
77+
*/
78+
protected ISerializer getSerializer() {
79+
return serializer;
80+
}
81+
82+
/**
83+
* Sets the raw JSON object
84+
*
85+
* @param serializer the serializer
86+
* @param json the JSON object to set this object to
87+
*/
88+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
89+
this.serializer = serializer;
90+
rawObject = json;
91+
92+
}
93+
}
Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
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 Application Template.
22+
*/
23+
public class ApplicationTemplate extends Entity implements IJsonBackedObject {
24+
25+
26+
/**
27+
* The Categories.
28+
* The list of categories for the application. Supported values can be: Collaboration, Business Management, Consumer,Content management, CRM, Data services, Developer services, E-commerce, Education, ERP, Finance, Health, Human resources, IT infrastructure, Mail, Management, Marketing, Media, Productivity, Project management, Telecommunications, Tools, Travel, and Web design &amp; hosting.
29+
*/
30+
@SerializedName(value = "categories", alternate = {"Categories"})
31+
@Expose
32+
public java.util.List<String> categories;
33+
34+
/**
35+
* The Description.
36+
* A description of the application.
37+
*/
38+
@SerializedName(value = "description", alternate = {"Description"})
39+
@Expose
40+
public String description;
41+
42+
/**
43+
* The Display Name.
44+
* The name of the application.
45+
*/
46+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
47+
@Expose
48+
public String displayName;
49+
50+
/**
51+
* The Home Page Url.
52+
* The home page URL of the application.
53+
*/
54+
@SerializedName(value = "homePageUrl", alternate = {"HomePageUrl"})
55+
@Expose
56+
public String homePageUrl;
57+
58+
/**
59+
* The Logo Url.
60+
* The URL to get the logo for this application.
61+
*/
62+
@SerializedName(value = "logoUrl", alternate = {"LogoUrl"})
63+
@Expose
64+
public String logoUrl;
65+
66+
/**
67+
* The Publisher.
68+
* The name of the publisher for this application.
69+
*/
70+
@SerializedName(value = "publisher", alternate = {"Publisher"})
71+
@Expose
72+
public String publisher;
73+
74+
/**
75+
* The Supported Provisioning Types.
76+
* The list of provisioning modes supported by this application. The only valid value is sync.
77+
*/
78+
@SerializedName(value = "supportedProvisioningTypes", alternate = {"SupportedProvisioningTypes"})
79+
@Expose
80+
public java.util.List<String> supportedProvisioningTypes;
81+
82+
/**
83+
* The Supported Single Sign On Modes.
84+
* The list of single sign-on modes supported by this application. The supported values are password, saml, external, and oidc.
85+
*/
86+
@SerializedName(value = "supportedSingleSignOnModes", alternate = {"SupportedSingleSignOnModes"})
87+
@Expose
88+
public java.util.List<String> supportedSingleSignOnModes;
89+
90+
91+
/**
92+
* The raw representation of this class
93+
*/
94+
private JsonObject rawObject;
95+
96+
/**
97+
* The serializer
98+
*/
99+
private ISerializer serializer;
100+
101+
/**
102+
* Gets the raw representation of this class
103+
*
104+
* @return the raw representation of this class
105+
*/
106+
public JsonObject getRawObject() {
107+
return rawObject;
108+
}
109+
110+
/**
111+
* Gets serializer
112+
*
113+
* @return the serializer
114+
*/
115+
protected ISerializer getSerializer() {
116+
return serializer;
117+
}
118+
119+
/**
120+
* Sets the raw JSON object
121+
*
122+
* @param serializer the serializer
123+
* @param json the JSON object to set this object to
124+
*/
125+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
126+
this.serializer = serializer;
127+
rawObject = json;
128+
129+
}
130+
}
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// Template Source: BaseMethodBody.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+
8+
import com.microsoft.graph.models.extensions.ApplicationServicePrincipal;
9+
import com.google.gson.annotations.Expose;
10+
import com.google.gson.annotations.SerializedName;
11+
import com.google.gson.JsonObject;
12+
import com.microsoft.graph.serializer.ISerializer;
13+
import java.util.EnumSet;
14+
15+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
16+
17+
/**
18+
* The class for the Application Template Instantiate Body.
19+
*/
20+
public class ApplicationTemplateInstantiateBody {
21+
22+
/**
23+
* The display Name.
24+
*
25+
*/
26+
@SerializedName(value = "displayName", alternate = {"DisplayName"})
27+
@Expose
28+
public String displayName;
29+
30+
31+
/**
32+
* The raw representation of this class
33+
*/
34+
private JsonObject rawObject;
35+
36+
/**
37+
* The serializer
38+
*/
39+
private ISerializer serializer;
40+
41+
/**
42+
* Gets the raw representation of this class
43+
*
44+
* @return the raw representation of this class
45+
*/
46+
public JsonObject getRawObject() {
47+
return rawObject;
48+
}
49+
50+
/**
51+
* Gets serializer
52+
*
53+
* @return the serializer
54+
*/
55+
protected ISerializer getSerializer() {
56+
return serializer;
57+
}
58+
59+
/**
60+
* Sets the raw JSON object
61+
*
62+
* @param serializer the serializer
63+
* @param json the JSON object to set this object to
64+
*/
65+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
66+
this.serializer = serializer;
67+
rawObject = json;
68+
69+
}
70+
}

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

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

289289
/**
290290
* The Visibility.
291-
* Specifies the visibility of a Microsoft 365 group. Possible values are: Private, Public, or Hiddenmembership; blank values are treated as public. See group visibility options to learn more.Visibility can be set only when a group is created; it is not editable.Visibility is supported only for unified groups; it is not supported for security groups. Returned by default.
291+
* Specifies the group join policy and group content visibility for groups. Possible values are: Private, Public, or Hiddenmembership. Hiddenmembership can be set only for Microsoft 365 groups, when the groups are created. It can't be updated later. Other values of visibility can be updated after group creation. If visibility value is not specified during group creation on Microsoft Graph, a security group is created as Private by default and Microsoft 365 group is Public. See group visibility options to learn more. Returned by default.
292292
*/
293293
@SerializedName(value = "visibility", alternate = {"Visibility"})
294294
@Expose

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.microsoft.graph.requests.extensions.IInvitationRequestBuilder;
1313
import com.microsoft.graph.requests.extensions.IUserCollectionRequestBuilder;
1414
import com.microsoft.graph.requests.extensions.IUserRequestBuilder;
15+
import com.microsoft.graph.requests.extensions.IApplicationTemplateCollectionRequestBuilder;
16+
import com.microsoft.graph.requests.extensions.IApplicationTemplateRequestBuilder;
1517
import com.microsoft.graph.requests.extensions.IAuthenticationMethodConfigurationCollectionRequestBuilder;
1618
import com.microsoft.graph.requests.extensions.IAuthenticationMethodConfigurationRequestBuilder;
1719
import com.microsoft.graph.requests.extensions.IIdentityProviderCollectionRequestBuilder;
@@ -135,6 +137,21 @@ public interface IBaseGraphServiceClient extends IBaseClient {
135137
*/
136138
IUserRequestBuilder users(final String id);
137139

140+
/**
141+
* Gets the collection of ApplicationTemplates objects
142+
*
143+
* @return the request builder for the collection of ApplicationTemplates objects
144+
*/
145+
IApplicationTemplateCollectionRequestBuilder applicationTemplates();
146+
147+
/**
148+
* Gets a single ApplicationTemplates
149+
*
150+
* @param id the id of the ApplicationTemplates to retrieve
151+
* @return the request builder for the ApplicationTemplates object
152+
*/
153+
IApplicationTemplateRequestBuilder applicationTemplates(final String id);
154+
138155
/**
139156
* Gets the collection of AuthenticationMethodConfigurations objects
140157
*

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.microsoft.graph.requests.extensions.IInvitationRequestBuilder;
1313
import com.microsoft.graph.requests.extensions.IUserCollectionRequestBuilder;
1414
import com.microsoft.graph.requests.extensions.IUserRequestBuilder;
15+
import com.microsoft.graph.requests.extensions.IApplicationTemplateCollectionRequestBuilder;
16+
import com.microsoft.graph.requests.extensions.IApplicationTemplateRequestBuilder;
1517
import com.microsoft.graph.requests.extensions.IAuthenticationMethodConfigurationCollectionRequestBuilder;
1618
import com.microsoft.graph.requests.extensions.IAuthenticationMethodConfigurationRequestBuilder;
1719
import com.microsoft.graph.requests.extensions.IIdentityProviderCollectionRequestBuilder;

0 commit comments

Comments
 (0)