Skip to content

Commit 9579cdf

Browse files
authored
Merge pull request #66 from microsoftgraph/beta/pipelinebuild/39951
Generated beta models and request builders using Typewriter
2 parents 2617569 + 047b11f commit 9579cdf

File tree

1,734 files changed

+209305
-149478
lines changed

Some content is hidden

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

1,734 files changed

+209305
-149478
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.3.0-SNAPSHOT'
22+
implementation 'com.microsoft.graph:microsoft-graph-beta:0.4.0-SNAPSHOT'
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-beta</artifactId>
34-
<version>0.3.0-SNAPSHOT</version>
34+
<version>0.4.0-SNAPSHOT</version>
3535
</dependency>
3636
```
3737

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

131131
[Third-party notices](THIRD%20PARTY%20NOTICES)
132132

133+

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 = 3
29+
mavenMinorVersion = 4
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -43,3 +43,4 @@ mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
4343
mavenCentralPublishingEnabled=false
4444

4545

46+

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

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

3636

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

src/main/java/com/microsoft/graph/models/extensions/Case.java renamed to src/main/java/com/microsoft/graph/ediscovery/models/extensions/Case.java

Lines changed: 66 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,29 @@
33
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
44
// ------------------------------------------------------------------------------
55

6-
package com.microsoft.graph.models.extensions;
6+
package com.microsoft.graph.ediscovery.models.extensions;
77
import com.microsoft.graph.serializer.ISerializer;
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.IdentitySet;
12-
import com.microsoft.graph.models.generated.CaseStatus;
13-
import com.microsoft.graph.models.extensions.Custodian;
14-
import com.microsoft.graph.models.extensions.Legalhold;
15-
import com.microsoft.graph.models.extensions.CaseOperation;
16-
import com.microsoft.graph.models.extensions.ReviewSet;
12+
import com.microsoft.graph.ediscovery.models.generated.CaseStatus;
13+
import com.microsoft.graph.ediscovery.models.extensions.Custodian;
14+
import com.microsoft.graph.ediscovery.models.extensions.LegalHold;
15+
import com.microsoft.graph.ediscovery.models.extensions.NoncustodialDataSource;
16+
import com.microsoft.graph.ediscovery.models.extensions.CaseOperation;
17+
import com.microsoft.graph.ediscovery.models.extensions.ReviewSet;
18+
import com.microsoft.graph.ediscovery.models.extensions.Settings;
19+
import com.microsoft.graph.ediscovery.models.extensions.SourceCollection;
20+
import com.microsoft.graph.ediscovery.models.extensions.Tag;
1721
import com.microsoft.graph.models.extensions.Entity;
18-
import com.microsoft.graph.requests.extensions.CustodianCollectionPage;
19-
import com.microsoft.graph.requests.extensions.LegalholdCollectionPage;
20-
import com.microsoft.graph.requests.extensions.CaseOperationCollectionPage;
21-
import com.microsoft.graph.requests.extensions.ReviewSetCollectionPage;
22+
import com.microsoft.graph.ediscovery.requests.extensions.CustodianCollectionPage;
23+
import com.microsoft.graph.ediscovery.requests.extensions.LegalHoldCollectionPage;
24+
import com.microsoft.graph.ediscovery.requests.extensions.NoncustodialDataSourceCollectionPage;
25+
import com.microsoft.graph.ediscovery.requests.extensions.CaseOperationCollectionPage;
26+
import com.microsoft.graph.ediscovery.requests.extensions.ReviewSetCollectionPage;
27+
import com.microsoft.graph.ediscovery.requests.extensions.SourceCollectionCollectionPage;
28+
import com.microsoft.graph.ediscovery.requests.extensions.TagCollectionPage;
2229

2330

2431
import com.google.gson.JsonObject;
@@ -114,12 +121,20 @@ public class Case extends Entity implements IJsonBackedObject {
114121
public CustodianCollectionPage custodians;
115122

116123
/**
117-
* The Legalholds.
124+
* The Legal Holds.
118125
*
119126
*/
120-
@SerializedName(value = "legalholds", alternate = {"Legalholds"})
127+
@SerializedName(value = "legalHolds", alternate = {"LegalHolds"})
121128
@Expose
122-
public LegalholdCollectionPage legalholds;
129+
public LegalHoldCollectionPage legalHolds;
130+
131+
/**
132+
* The Noncustodial Data Sources.
133+
*
134+
*/
135+
@SerializedName(value = "noncustodialDataSources", alternate = {"NoncustodialDataSources"})
136+
@Expose
137+
public NoncustodialDataSourceCollectionPage noncustodialDataSources;
123138

124139
/**
125140
* The Operations.
@@ -137,6 +152,30 @@ public class Case extends Entity implements IJsonBackedObject {
137152
@Expose
138153
public ReviewSetCollectionPage reviewSets;
139154

155+
/**
156+
* The Settings.
157+
*
158+
*/
159+
@SerializedName(value = "settings", alternate = {"Settings"})
160+
@Expose
161+
public Settings settings;
162+
163+
/**
164+
* The Source Collections.
165+
*
166+
*/
167+
@SerializedName(value = "sourceCollections", alternate = {"SourceCollections"})
168+
@Expose
169+
public SourceCollectionCollectionPage sourceCollections;
170+
171+
/**
172+
* The Tags.
173+
*
174+
*/
175+
@SerializedName(value = "tags", alternate = {"Tags"})
176+
@Expose
177+
public TagCollectionPage tags;
178+
140179

141180
/**
142181
* The raw representation of this class
@@ -181,8 +220,12 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
181220
custodians = serializer.deserializeObject(json.get("custodians").toString(), CustodianCollectionPage.class);
182221
}
183222

184-
if (json.has("legalholds")) {
185-
legalholds = serializer.deserializeObject(json.get("legalholds").toString(), LegalholdCollectionPage.class);
223+
if (json.has("legalHolds")) {
224+
legalHolds = serializer.deserializeObject(json.get("legalHolds").toString(), LegalHoldCollectionPage.class);
225+
}
226+
227+
if (json.has("noncustodialDataSources")) {
228+
noncustodialDataSources = serializer.deserializeObject(json.get("noncustodialDataSources").toString(), NoncustodialDataSourceCollectionPage.class);
186229
}
187230

188231
if (json.has("operations")) {
@@ -192,5 +235,13 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
192235
if (json.has("reviewSets")) {
193236
reviewSets = serializer.deserializeObject(json.get("reviewSets").toString(), ReviewSetCollectionPage.class);
194237
}
238+
239+
if (json.has("sourceCollections")) {
240+
sourceCollections = serializer.deserializeObject(json.get("sourceCollections").toString(), SourceCollectionCollectionPage.class);
241+
}
242+
243+
if (json.has("tags")) {
244+
tags = serializer.deserializeObject(json.get("tags").toString(), TagCollectionPage.class);
245+
}
195246
}
196247
}

src/main/java/com/microsoft/graph/models/extensions/CaseExportOperation.java renamed to src/main/java/com/microsoft/graph/ediscovery/models/extensions/CaseExportOperation.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
44
// ------------------------------------------------------------------------------
55

6-
package com.microsoft.graph.models.extensions;
6+
package com.microsoft.graph.ediscovery.models.extensions;
77
import com.microsoft.graph.serializer.ISerializer;
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11-
import com.microsoft.graph.models.generated.ExportOptions;
12-
import com.microsoft.graph.models.generated.ExportFileStructure;
13-
import com.microsoft.graph.models.extensions.ReviewSet;
14-
import com.microsoft.graph.models.extensions.CaseOperation;
11+
import com.microsoft.graph.ediscovery.models.generated.ExportOptions;
12+
import com.microsoft.graph.ediscovery.models.generated.ExportFileStructure;
13+
import com.microsoft.graph.ediscovery.models.extensions.ReviewSet;
14+
import com.microsoft.graph.ediscovery.models.extensions.CaseOperation;
1515

1616

1717
import com.google.gson.JsonObject;

src/main/java/com/microsoft/graph/models/extensions/CaseIndexOperation.java renamed to src/main/java/com/microsoft/graph/ediscovery/models/extensions/CaseIndexOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
44
// ------------------------------------------------------------------------------
55

6-
package com.microsoft.graph.models.extensions;
6+
package com.microsoft.graph.ediscovery.models.extensions;
77
import com.microsoft.graph.serializer.ISerializer;
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11-
import com.microsoft.graph.models.extensions.CaseOperation;
11+
import com.microsoft.graph.ediscovery.models.extensions.CaseOperation;
1212

1313

1414
import com.google.gson.JsonObject;

src/main/java/com/microsoft/graph/models/extensions/CaseOperation.java renamed to src/main/java/com/microsoft/graph/ediscovery/models/extensions/CaseOperation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
44
// ------------------------------------------------------------------------------
55

6-
package com.microsoft.graph.models.extensions;
6+
package com.microsoft.graph.ediscovery.models.extensions;
77
import com.microsoft.graph.serializer.ISerializer;
88
import com.microsoft.graph.serializer.IJsonBackedObject;
99
import com.microsoft.graph.serializer.AdditionalDataManager;
1010
import java.util.EnumSet;
11-
import com.microsoft.graph.models.generated.CaseAction;
11+
import com.microsoft.graph.ediscovery.models.generated.CaseAction;
1212
import com.microsoft.graph.models.extensions.IdentitySet;
1313
import com.microsoft.graph.models.extensions.ResultInfo;
14-
import com.microsoft.graph.models.generated.CaseOperationStatus;
14+
import com.microsoft.graph.ediscovery.models.generated.CaseOperationStatus;
1515
import com.microsoft.graph.models.extensions.Entity;
1616

1717

0 commit comments

Comments
 (0)