Skip to content

Commit 1f1c398

Browse files
authored
Merge pull request #31 from microsoftgraph/revert-30-beta/pipelinebuild/3772600
Revert "Generated beta models and request builders using Typewriter"
2 parents 730a00b + 7e61d60 commit 1f1c398

32 files changed

+39
-1327
lines changed

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Arrays;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.TeamsApp;
12+
import com.microsoft.graph.models.extensions.Entity;
1213
import com.microsoft.graph.requests.extensions.TeamsAppCollectionResponse;
1314
import com.microsoft.graph.requests.extensions.TeamsAppCollectionPage;
1415

@@ -22,18 +23,8 @@
2223
/**
2324
* The class for the App Catalogs.
2425
*/
25-
public class AppCatalogs implements IJsonBackedObject {
26+
public class AppCatalogs extends Entity implements IJsonBackedObject {
2627

27-
@SerializedName("@odata.type")
28-
@Expose
29-
public String oDataType;
30-
31-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
32-
33-
@Override
34-
public final AdditionalDataManager additionalDataManager() {
35-
return additionalDataManager;
36-
}
3728

3829
/**
3930
* The Teams Apps.

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Arrays;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.BitlockerRecoveryKey;
12+
import com.microsoft.graph.models.extensions.Entity;
1213
import com.microsoft.graph.requests.extensions.BitlockerRecoveryKeyCollectionResponse;
1314
import com.microsoft.graph.requests.extensions.BitlockerRecoveryKeyCollectionPage;
1415

@@ -22,18 +23,8 @@
2223
/**
2324
* The class for the Bitlocker.
2425
*/
25-
public class Bitlocker implements IJsonBackedObject {
26+
public class Bitlocker extends Entity implements IJsonBackedObject {
2627

27-
@SerializedName("@odata.type")
28-
@Expose
29-
public String oDataType;
30-
31-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
32-
33-
@Override
34-
public final AdditionalDataManager additionalDataManager() {
35-
return additionalDataManager;
36-
}
3728

3829
/**
3930
* The Recovery Keys.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public class ChatMessage extends Entity implements IJsonBackedObject {
152152

153153
/**
154154
* The Policy Violation.
155-
* Defines the properties of a policy violation set by a data loss prevention (DLP) application.
155+
*
156156
*/
157157
@SerializedName("policyViolation")
158158
@Expose

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,39 @@ public final AdditionalDataManager additionalDataManager() {
3838

3939
/**
4040
* The Dlp Action.
41-
* The action taken by the DLP provider on the message with sensitive content. Supported values are: NoneNotifySender -- Inform the sender of the violation but allow readers to read the message.BlockAccess -- Block readers from reading the message.BlockAccessExternal -- Block users outside the organization from reading the message, while allowing users within the organization to read the message.
41+
*
4242
*/
4343
@SerializedName("dlpAction")
4444
@Expose
4545
public EnumSet<ChatMessagePolicyViolationDlpActionTypes> dlpAction;
4646

4747
/**
4848
* The Justification Text.
49-
* Justification text provided by the sender of the message when overriding a policy violation.
49+
*
5050
*/
5151
@SerializedName("justificationText")
5252
@Expose
5353
public String justificationText;
5454

5555
/**
5656
* The Policy Tip.
57-
* Information to display to the message sender about why the message was flagged as a violation.
57+
*
5858
*/
5959
@SerializedName("policyTip")
6060
@Expose
6161
public ChatMessagePolicyViolationPolicyTip policyTip;
6262

6363
/**
6464
* The User Action.
65-
* Indicates the action taken by the user on a message blocked by the DLP provider. Supported values are: NoneOverrideReportFalsePositiveWhen the DLP provider is updating the message for blocking sensitive content, userAction is not required.
65+
*
6666
*/
6767
@SerializedName("userAction")
6868
@Expose
6969
public EnumSet<ChatMessagePolicyViolationUserActionTypes> userAction;
7070

7171
/**
7272
* The Verdict Details.
73-
* Indicates what actions the sender may take in response to the policy violation. Supported values are: NoneAllowFalsePositiveOverride -- Allows the sender to declare the policyViolation to be an error in the DLP app and its rules, and allow readers to see the message again if the dlpAction had hidden it.AllowOverrideWithoutJustification -- Allows the sender to overriide the DLP violation and allow readers to see the message again if the dlpAction had hidden it, without needing to provide an explanation for doing so. AllowOverrideWithJustification -- Allows the sender to overriide the DLP violation and allow readers to see the message again if the dlpAction had hidden it, after providing an explanation for doing so.AllowOverrideWithoutJustification and AllowOverrideWithJustification are mutually exclusive.
73+
*
7474
*/
7575
@SerializedName("verdictDetails")
7676
@Expose

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ public final AdditionalDataManager additionalDataManager() {
3434

3535
/**
3636
* The Compliance Url.
37-
* The URL a user can visit to read about the data loss prevention policies for the organization. (ie, policies about what users shouldn't say in chats)
37+
*
3838
*/
3939
@SerializedName("complianceUrl")
4040
@Expose
4141
public String complianceUrl;
4242

4343
/**
4444
* The General Text.
45-
* Explanatory text shown to the sender of the message.
45+
*
4646
*/
4747
@SerializedName("generalText")
4848
@Expose
4949
public String generalText;
5050

5151
/**
5252
* The Matched Condition Descriptions.
53-
* The list of improper data in the message that was detected by the data loss prevention app. Each DLP app defines its own conditions, examples include 'Credit Card Number' and 'Social Security Number'.
53+
*
5454
*/
5555
@SerializedName("matchedConditionDescriptions")
5656
@Expose

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.Call;
1212
import com.microsoft.graph.models.extensions.OnlineMeeting;
13+
import com.microsoft.graph.models.extensions.Entity;
1314
import com.microsoft.graph.requests.extensions.CallCollectionResponse;
1415
import com.microsoft.graph.requests.extensions.CallCollectionPage;
1516
import com.microsoft.graph.requests.extensions.OnlineMeetingCollectionResponse;
@@ -25,18 +26,8 @@
2526
/**
2627
* The class for the Comms Application.
2728
*/
28-
public class CommsApplication implements IJsonBackedObject {
29+
public class CommsApplication extends Entity implements IJsonBackedObject {
2930

30-
@SerializedName("@odata.type")
31-
@Expose
32-
public String oDataType;
33-
34-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
35-
36-
@Override
37-
public final AdditionalDataManager additionalDataManager() {
38-
return additionalDataManager;
39-
}
4031

4132
/**
4233
* The Calls.

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Arrays;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.Ediscovery;
12+
import com.microsoft.graph.models.extensions.Entity;
1213

1314

1415
import com.google.gson.JsonObject;
@@ -20,18 +21,8 @@
2021
/**
2122
* The class for the Compliance.
2223
*/
23-
public class Compliance implements IJsonBackedObject {
24+
public class Compliance extends Entity implements IJsonBackedObject {
2425

25-
@SerializedName("@odata.type")
26-
@Expose
27-
public String oDataType;
28-
29-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
30-
31-
@Override
32-
public final AdditionalDataManager additionalDataManager() {
33-
return additionalDataManager;
34-
}
3526

3627
/**
3728
* The Ediscovery.

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Arrays;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.ExternalConnection;
12+
import com.microsoft.graph.models.extensions.Entity;
1213
import com.microsoft.graph.requests.extensions.ExternalConnectionCollectionResponse;
1314
import com.microsoft.graph.requests.extensions.ExternalConnectionCollectionPage;
1415

@@ -22,18 +23,8 @@
2223
/**
2324
* The class for the External.
2425
*/
25-
public class External implements IJsonBackedObject {
26+
public class External extends Entity implements IJsonBackedObject {
2627

27-
@SerializedName("@odata.type")
28-
@Expose
29-
public String oDataType;
30-
31-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
32-
33-
@Override
34-
public final AdditionalDataManager additionalDataManager() {
35-
return additionalDataManager;
36-
}
3728

3829
/**
3930
* The Connections.

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Arrays;
1010
import java.util.EnumSet;
1111
import com.microsoft.graph.models.extensions.Company;
12+
import com.microsoft.graph.models.extensions.Entity;
1213
import com.microsoft.graph.requests.extensions.CompanyCollectionResponse;
1314
import com.microsoft.graph.requests.extensions.CompanyCollectionPage;
1415

@@ -22,18 +23,8 @@
2223
/**
2324
* The class for the Financials.
2425
*/
25-
public class Financials implements IJsonBackedObject {
26+
public class Financials extends Entity implements IJsonBackedObject {
2627

27-
@SerializedName("@odata.type")
28-
@Expose
29-
public String oDataType;
30-
31-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
32-
33-
@Override
34-
public final AdditionalDataManager additionalDataManager() {
35-
return additionalDataManager;
36-
}
3728

3829
/**
3930
* The Companies.

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.microsoft.graph.models.extensions.B2xIdentityUserFlow;
1414
import com.microsoft.graph.models.extensions.IdentityUserFlow;
1515
import com.microsoft.graph.models.extensions.ContinuousAccessEvaluationPolicy;
16+
import com.microsoft.graph.models.extensions.Entity;
1617
import com.microsoft.graph.requests.extensions.B2cIdentityUserFlowCollectionResponse;
1718
import com.microsoft.graph.requests.extensions.B2cIdentityUserFlowCollectionPage;
1819
import com.microsoft.graph.requests.extensions.B2xIdentityUserFlowCollectionResponse;
@@ -30,18 +31,8 @@
3031
/**
3132
* The class for the Identity Container.
3233
*/
33-
public class IdentityContainer implements IJsonBackedObject {
34+
public class IdentityContainer extends Entity implements IJsonBackedObject {
3435

35-
@SerializedName("@odata.type")
36-
@Expose
37-
public String oDataType;
38-
39-
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
40-
41-
@Override
42-
public final AdditionalDataManager additionalDataManager() {
43-
return additionalDataManager;
44-
}
4536

4637
/**
4738
* The Conditional Access.

0 commit comments

Comments
 (0)