Skip to content

Commit ac9c75c

Browse files
Merge pull request #1440 from microsoftgraph/v1.0/pipelinebuild/114201
Generated models and request builders
2 parents 5bb65a7 + aab2dd5 commit ac9c75c

40 files changed

+1147
-57
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [5.57.0] - 2023-05-12
15+
16+
### Added
17+
18+
- CrossTenantUserSyncInbound model.
19+
- CrossTenantIdentitySyncPolicyPartner model and related requests.
20+
- The following models have been added to the externalConnectors namespace:
21+
- ActivitySettings
22+
- DisplayTemplate
23+
- ItemIdResolver
24+
- PropertyRule
25+
- RuleOperation
26+
- SearchSettings
27+
- UrlMatchInfo
28+
- UrlToItemResolverBase.
29+
1430
## [5.56.0] - 2023-05-03
1531

1632
### Added

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:5.56.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.57.0'
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</artifactId>
39-
<version>5.56.0</version>
39+
<version>5.57.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
@@ -187,5 +187,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
187187

188188

189189

190+
190191

191192

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
2828
mavenMajorVersion = 5
29-
mavenMinorVersion = 56
29+
mavenMinorVersion = 57
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -110,5 +110,6 @@ mavenCentralPublishingEnabled=false
110110

111111

112112

113+
113114

114115

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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.http.BaseCollectionPage;
12+
import com.microsoft.graph.externalconnectors.models.UrlToItemResolverBase;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
import javax.annotation.Nullable;
19+
import javax.annotation.Nonnull;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Activity Settings.
25+
*/
26+
public class ActivitySettings implements IJsonBackedObject {
27+
28+
/** the OData type of the object as returned by the service */
29+
@SerializedName("@odata.type")
30+
@Expose
31+
@Nullable
32+
public String oDataType;
33+
34+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
35+
36+
@Override
37+
@Nonnull
38+
public final AdditionalDataManager additionalDataManager() {
39+
return additionalDataManager;
40+
}
41+
42+
/**
43+
* The Url To Item Resolvers.
44+
* Specifies configurations to identify an externalItem based on a shared URL.
45+
*/
46+
@SerializedName(value = "urlToItemResolvers", alternate = {"UrlToItemResolvers"})
47+
@Expose
48+
@Nullable
49+
public java.util.List<UrlToItemResolverBase> urlToItemResolvers;
50+
51+
52+
/**
53+
* Sets the raw JSON object
54+
*
55+
* @param serializer the serializer
56+
* @param json the JSON object to set this object to
57+
*/
58+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
59+
60+
}
61+
}
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
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.http.BaseCollectionPage;
12+
import com.microsoft.graph.externalconnectors.models.PropertyRule;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
import javax.annotation.Nullable;
19+
import javax.annotation.Nonnull;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Display Template.
25+
*/
26+
public class DisplayTemplate implements IJsonBackedObject {
27+
28+
/** the OData type of the object as returned by the service */
29+
@SerializedName("@odata.type")
30+
@Expose
31+
@Nullable
32+
public String oDataType;
33+
34+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
35+
36+
@Override
37+
@Nonnull
38+
public final AdditionalDataManager additionalDataManager() {
39+
return additionalDataManager;
40+
}
41+
42+
/**
43+
* The Id.
44+
* The text identifier for the display template; for example, contosoTickets. Maximum 16 characters. Only alphanumeric characters allowed.
45+
*/
46+
@SerializedName(value = "id", alternate = {"Id"})
47+
@Expose
48+
@Nullable
49+
public String id;
50+
51+
/**
52+
* The Layout.
53+
* The definition of the content's appearance, represented by an Adaptive Card, which is a JSON-serialized card object model.
54+
*/
55+
@SerializedName(value = "layout", alternate = {"Layout"})
56+
@Expose
57+
@Nullable
58+
public com.google.gson.JsonElement layout;
59+
60+
/**
61+
* The Priority.
62+
* Defines the priority of a display template. A display template with priority 1 is evaluated before a template with priority 4. Gaps in priority values are supported. Must be positive value.
63+
*/
64+
@SerializedName(value = "priority", alternate = {"Priority"})
65+
@Expose
66+
@Nullable
67+
public Integer priority;
68+
69+
/**
70+
* The Rules.
71+
* Specifies additional rules for selecting this display template based on the item schema. Optional.
72+
*/
73+
@SerializedName(value = "rules", alternate = {"Rules"})
74+
@Expose
75+
@Nullable
76+
public java.util.List<PropertyRule> rules;
77+
78+
79+
/**
80+
* Sets the raw JSON object
81+
*
82+
* @param serializer the serializer
83+
* @param json the JSON object to set this object to
84+
*/
85+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
86+
87+
}
88+
}

src/main/java/com/microsoft/graph/externalconnectors/models/ExternalConnection.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.http.BaseCollectionPage;
12+
import com.microsoft.graph.externalconnectors.models.ActivitySettings;
1213
import com.microsoft.graph.externalconnectors.models.Configuration;
14+
import com.microsoft.graph.externalconnectors.models.SearchSettings;
1315
import com.microsoft.graph.externalconnectors.models.ConnectionState;
1416
import com.microsoft.graph.externalconnectors.models.Schema;
1517
import com.microsoft.graph.models.Entity;
@@ -32,6 +34,15 @@
3234
public class ExternalConnection extends Entity implements IJsonBackedObject {
3335

3436

37+
/**
38+
* The Activity Settings.
39+
* Collects configurable settings related to activities involving connector content.
40+
*/
41+
@SerializedName(value = "activitySettings", alternate = {"ActivitySettings"})
42+
@Expose
43+
@Nullable
44+
public ActivitySettings activitySettings;
45+
3546
/**
3647
* The Configuration.
3748
* Specifies additional application IDs that are allowed to manage the connection and to index content in the connection. Optional.
@@ -59,6 +70,15 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {
5970
@Nullable
6071
public String name;
6172

73+
/**
74+
* The Search Settings.
75+
* The settings configuring the search experience for content in this connection, such as the display templates for search results.
76+
*/
77+
@SerializedName(value = "searchSettings", alternate = {"SearchSettings"})
78+
@Expose
79+
@Nullable
80+
public SearchSettings searchSettings;
81+
6282
/**
6383
* The State.
6484
* Indicates the current state of the connection. Possible values are: draft, ready, obsolete, limitExceeded, unknownFutureValue.
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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.UrlMatchInfo;
12+
import com.microsoft.graph.externalconnectors.models.UrlToItemResolverBase;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.annotations.SerializedName;
17+
import com.google.gson.annotations.Expose;
18+
import javax.annotation.Nullable;
19+
import javax.annotation.Nonnull;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Item Id Resolver.
25+
*/
26+
public class ItemIdResolver extends UrlToItemResolverBase implements IJsonBackedObject {
27+
28+
29+
/**
30+
* The Item Id.
31+
* Pattern that specifies how to form the ID of the external item that the URL represents. The named groups from the regular expression in urlPattern within the urlMatchInfo can be referenced by inserting the group name inside curly brackets.
32+
*/
33+
@SerializedName(value = "itemId", alternate = {"ItemId"})
34+
@Expose
35+
@Nullable
36+
public String itemId;
37+
38+
/**
39+
* The Url Match Info.
40+
* Configurations to match and resolve URL.
41+
*/
42+
@SerializedName(value = "urlMatchInfo", alternate = {"UrlMatchInfo"})
43+
@Expose
44+
@Nullable
45+
public UrlMatchInfo urlMatchInfo;
46+
47+
48+
/**
49+
* Sets the raw JSON object
50+
*
51+
* @param serializer the serializer
52+
* @param json the JSON object to set this object to
53+
*/
54+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
55+
56+
}
57+
}

0 commit comments

Comments
 (0)