Skip to content

Commit bf6ec5a

Browse files
baywetbaywet
authored
Merge pull request #144 from microsoftgraph/beta/pipelinebuild/54427
Generated beta models and request builders using Typewriter
2 parents 9a6ccc5 + 44f739e commit bf6ec5a

File tree

48 files changed

+989
-63
lines changed

Some content is hidden

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

48 files changed

+989
-63
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.23.0-SNAPSHOT'
22+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.24.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.23.0-SNAPSHOT</version>
39+
<version>0.24.0-SNAPSHOT</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCrendentialAuthProvider -->
@@ -163,3 +163,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
163163

164164

165165

166+

‎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 = 23
29+
mavenMinorVersion = 24
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

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

6161

6262

63+
6364

6465

‎src/main/java/com/microsoft/graph/externalconnectors/models/DisplayTemplate.java‎

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+
*
45+
*/
46+
@SerializedName(value = "id", alternate = {"Id"})
47+
@Expose
48+
@Nullable
49+
public String id;
50+
51+
/**
52+
* The Layout.
53+
*
54+
*/
55+
@SerializedName(value = "layout", alternate = {"Layout"})
56+
@Expose
57+
@Nullable
58+
public com.google.gson.JsonElement layout;
59+
60+
/**
61+
* The Priority.
62+
*
63+
*/
64+
@SerializedName(value = "priority", alternate = {"Priority"})
65+
@Expose
66+
@Nullable
67+
public Integer priority;
68+
69+
/**
70+
* The Rules.
71+
*
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.http.BaseCollectionPage;
1212
import com.microsoft.graph.externalconnectors.models.Configuration;
13+
import com.microsoft.graph.externalconnectors.models.SearchSettings;
1314
import com.microsoft.graph.externalconnectors.models.ConnectionState;
1415
import com.microsoft.graph.externalconnectors.models.ExternalGroup;
1516
import com.microsoft.graph.externalconnectors.models.ExternalItem;
@@ -44,6 +45,15 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {
4445
@Nullable
4546
public Configuration configuration;
4647

48+
/**
49+
* The Connector Id.
50+
*
51+
*/
52+
@SerializedName(value = "connectorId", alternate = {"ConnectorId"})
53+
@Expose
54+
@Nullable
55+
public String connectorId;
56+
4757
/**
4858
* The Description.
4959
* Description of the connection displayed in the Microsoft 365 admin center. Optional.
@@ -62,6 +72,15 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {
6272
@Nullable
6373
public String name;
6474

75+
/**
76+
* The Search Settings.
77+
*
78+
*/
79+
@SerializedName(value = "searchSettings", alternate = {"SearchSettings"})
80+
@Expose
81+
@Nullable
82+
public SearchSettings searchSettings;
83+
6584
/**
6685
* The State.
6786
* Indicates the current state of the connection. Possible values are draft, ready, obsolete, and limitExceeded. Required.

‎src/main/java/com/microsoft/graph/externalconnectors/models/PropertyRule.java‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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.RuleOperation;
13+
import com.microsoft.graph.models.BinaryOperator;
14+
15+
16+
import com.google.gson.JsonObject;
17+
import com.google.gson.annotations.SerializedName;
18+
import com.google.gson.annotations.Expose;
19+
import javax.annotation.Nullable;
20+
import javax.annotation.Nonnull;
21+
22+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
23+
24+
/**
25+
* The class for the Property Rule.
26+
*/
27+
public class PropertyRule implements IJsonBackedObject {
28+
29+
/** the OData type of the object as returned by the service */
30+
@SerializedName("@odata.type")
31+
@Expose
32+
@Nullable
33+
public String oDataType;
34+
35+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
36+
37+
@Override
38+
@Nonnull
39+
public final AdditionalDataManager additionalDataManager() {
40+
return additionalDataManager;
41+
}
42+
43+
/**
44+
* The Operation.
45+
*
46+
*/
47+
@SerializedName(value = "operation", alternate = {"Operation"})
48+
@Expose
49+
@Nullable
50+
public RuleOperation operation;
51+
52+
/**
53+
* The Property.
54+
*
55+
*/
56+
@SerializedName(value = "property", alternate = {"Property"})
57+
@Expose
58+
@Nullable
59+
public String property;
60+
61+
/**
62+
* The Values.
63+
*
64+
*/
65+
@SerializedName(value = "values", alternate = {"Values"})
66+
@Expose
67+
@Nullable
68+
public java.util.List<String> values;
69+
70+
/**
71+
* The Values Joined By.
72+
*
73+
*/
74+
@SerializedName(value = "valuesJoinedBy", alternate = {"ValuesJoinedBy"})
75+
@Expose
76+
@Nullable
77+
public BinaryOperator valuesJoinedBy;
78+
79+
80+
/**
81+
* Sets the raw JSON object
82+
*
83+
* @param serializer the serializer
84+
* @param json the JSON object to set this object to
85+
*/
86+
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
87+
88+
}
89+
}

‎src/main/java/com/microsoft/graph/externalconnectors/models/RuleOperation.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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 Rule Operation.
11+
*/
12+
public enum RuleOperation
13+
{
14+
/**
15+
* null
16+
*/
17+
NULL,
18+
/**
19+
* equals
20+
*/
21+
EQUALS,
22+
/**
23+
* not Equals
24+
*/
25+
NOT_EQUALS,
26+
/**
27+
* contains
28+
*/
29+
CONTAINS,
30+
/**
31+
* not Contains
32+
*/
33+
NOT_CONTAINS,
34+
/**
35+
* less Than
36+
*/
37+
LESS_THAN,
38+
/**
39+
* greater Than
40+
*/
41+
GREATER_THAN,
42+
/**
43+
* starts With
44+
*/
45+
STARTS_WITH,
46+
/**
47+
* unknown Future Value
48+
*/
49+
UNKNOWN_FUTURE_VALUE,
50+
/**
51+
* For RuleOperation values that were not expected from the service
52+
*/
53+
UNEXPECTED_VALUE
54+
}

‎src/main/java/com/microsoft/graph/externalconnectors/models/SearchSettings.java‎

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.DisplayTemplate;
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 Search Settings.
25+
*/
26+
public class SearchSettings 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 Search Result Templates.
44+
*
45+
*/
46+
@SerializedName(value = "searchResultTemplates", alternate = {"SearchResultTemplates"})
47+
@Expose
48+
@Nullable
49+
public java.util.List<DisplayTemplate> searchResultTemplates;
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+
}

‎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.23.0";
21+
public static final String VERSION_NAME = "0.24.0";
2222
}
2323

2424

@@ -37,3 +37,4 @@ private Constants() {
3737

3838

3939

40+

0 commit comments

Comments
 (0)