Skip to content

Commit

Permalink
Merge pull request #711 from microsoftgraph/v1.0/pipelinebuild/45773
Browse files Browse the repository at this point in the history
Generated v1.0 models and request builders using Typewriter
  • Loading branch information
baywet committed Apr 1, 2021
2 parents 6d233f2 + 95524dc commit 4638206
Show file tree
Hide file tree
Showing 95 changed files with 9,115 additions and 1,559 deletions.
5 changes: 3 additions & 2 deletions README.md
Expand Up @@ -19,7 +19,7 @@ repositories {
dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph:3.1.0'
implementation 'com.microsoft.graph:microsoft-graph:3.2.0'
// Uncomment the line below if you are building an android application
//implementation 'com.google.guava:guava:29.0-android'
}
Expand All @@ -33,7 +33,7 @@ Add the dependency in `dependencies` in pom.xml
<dependency>
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</dependency>
```

Expand Down Expand Up @@ -127,3 +127,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI

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


3 changes: 2 additions & 1 deletion gradle.properties
Expand Up @@ -26,7 +26,7 @@ org.gradle.caching=true
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 3
mavenMinorVersion = 1
mavenMinorVersion = 2
mavenPatchVersion = 0
mavenArtifactSuffix =

Expand All @@ -45,3 +45,4 @@ mavenCentralPublishingEnabled=false




3 changes: 2 additions & 1 deletion src/main/java/com/microsoft/graph/info/Constants.java
Expand Up @@ -18,7 +18,8 @@ private Constants() {
/** The client secret to use for unit testing */
public static final String CLIENTSECRET = "clientsecret";
/** The SDK version */
public static final String VERSION_NAME = "3.1.0";
public static final String VERSION_NAME = "3.2.0";
}



@@ -0,0 +1,47 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models;
import com.microsoft.graph.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.TeamworkNotificationRecipient;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the Aad User Notification Recipient.
*/
public class AadUserNotificationRecipient extends TeamworkNotificationRecipient implements IJsonBackedObject {


/**
* The User Id.
* Azure AD user identifier. Use the List users method to get this ID.
*/
@SerializedName(value = "userId", alternate = {"UserId"})
@Expose
@Nullable
public String userId;


/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {

}
}
Expand Up @@ -48,7 +48,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Query Root.
* In the scenario where reviewers need to be specified dynamically, this property is used to indicate the relative source of the query. This property is only required if a relative query (i.e., ./manager) is specified.
* The type of query. Examples include MicrosoftGraph and ARM.
*/
@SerializedName(value = "queryRoot", alternate = {"QueryRoot"})
@Expose
Expand All @@ -57,7 +57,7 @@ public final AdditionalDataManager additionalDataManager() {

/**
* The Query Type.
* The type of query. Examples include MicrosoftGraph and ARM.
* In the scenario where reviewers need to be specified dynamically, this property is used to indicate the relative source of the query. This property is only required if a relative query (i.e., ./manager) is specified.
*/
@SerializedName(value = "queryType", alternate = {"QueryType"})
@Expose
Expand Down
Expand Up @@ -65,7 +65,7 @@ public class AdminConsentRequestPolicy extends Entity implements IJsonBackedObje

/**
* The Reviewers.
* Required.
* The list of reviewers for the admin consent. Required.
*/
@SerializedName(value = "reviewers", alternate = {"Reviewers"})
@Expose
Expand Down
Expand Up @@ -36,7 +36,7 @@ public class AppRoleAssignment extends DirectoryObject implements IJsonBackedObj

/**
* The Created Date Time.
*
* The time when the app role assignment was created.The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only.
*/
@SerializedName(value = "createdDateTime", alternate = {"CreatedDateTime"})
@Expose
Expand Down
56 changes: 56 additions & 0 deletions src/main/java/com/microsoft/graph/models/AppScope.java
@@ -0,0 +1,56 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models;
import com.microsoft.graph.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.Entity;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the App Scope.
*/
public class AppScope extends Entity implements IJsonBackedObject {


/**
* The Display Name.
* Provides the display name of the app-specific resource represented by the app scope. Provided for display purposes since appScopeId is often an immutable, non-human-readable id. This property is read only.
*/
@SerializedName(value = "displayName", alternate = {"DisplayName"})
@Expose
@Nullable
public String displayName;

/**
* The Type.
* Describes the type of app-specific resource represented by the app scope. Provided for display purposes, so a user interface can convey to the user the kind of app specific resource represented by the app scope. This property is read only.
*/
@SerializedName(value = "type", alternate = {"Type"})
@Expose
@Nullable
public String type;


/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {

}
}
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/models/Approval.java
Expand Up @@ -30,7 +30,7 @@ public class Approval extends Entity implements IJsonBackedObject {

/**
* The Stages.
* Used for the approvalStages property of approval settings in the requestApprovalSettings property of an access package assignment policy. Specifies the primary, fallback, and escalation approvers of each stage.
* A collection of stages in the approval decision.
*/
@SerializedName(value = "stages", alternate = {"Stages"})
@Expose
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/microsoft/graph/models/ApprovalStage.java
Expand Up @@ -28,7 +28,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Assigned To Me.
*
* Indicates whether the stage is assigned to the calling user to review. Read-only.
*/
@SerializedName(value = "assignedToMe", alternate = {"AssignedToMe"})
@Expose
Expand All @@ -37,7 +37,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Display Name.
*
* The label provided by the policy creator to identify an approval stage. Read-only.
*/
@SerializedName(value = "displayName", alternate = {"DisplayName"})
@Expose
Expand All @@ -46,7 +46,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Justification.
*
* The justification associated with the approval stage decision.
*/
@SerializedName(value = "justification", alternate = {"Justification"})
@Expose
Expand All @@ -55,7 +55,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Reviewed By.
*
* The identifier of the reviewer. Read-only.
*/
@SerializedName(value = "reviewedBy", alternate = {"ReviewedBy"})
@Expose
Expand All @@ -64,7 +64,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Reviewed Date Time.
*
* The date and time when a decision was recorded. The date and time information uses ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only.
*/
@SerializedName(value = "reviewedDateTime", alternate = {"ReviewedDateTime"})
@Expose
Expand All @@ -73,7 +73,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Review Result.
*
* The result of this approval record. Possible values include: NotReviewed, Approved, Denied.
*/
@SerializedName(value = "reviewResult", alternate = {"ReviewResult"})
@Expose
Expand All @@ -82,7 +82,7 @@ public class ApprovalStage extends Entity implements IJsonBackedObject {

/**
* The Status.
*
* The stage status. Possible values: InProgress, Initializing, Completed, Expired. Read-only.
*/
@SerializedName(value = "status", alternate = {"Status"})
@Expose
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/microsoft/graph/models/AuditLogRoot.java
Expand Up @@ -10,10 +10,12 @@
import java.util.EnumSet;
import com.microsoft.graph.http.BaseCollectionPage;
import com.microsoft.graph.models.DirectoryAudit;
import com.microsoft.graph.models.ProvisioningObjectSummary;
import com.microsoft.graph.models.RestrictedSignIn;
import com.microsoft.graph.models.SignIn;
import com.microsoft.graph.models.Entity;
import com.microsoft.graph.requests.DirectoryAuditCollectionPage;
import com.microsoft.graph.requests.ProvisioningObjectSummaryCollectionPage;
import com.microsoft.graph.requests.RestrictedSignInCollectionPage;
import com.microsoft.graph.requests.SignInCollectionPage;

Expand Down Expand Up @@ -41,6 +43,15 @@ public class AuditLogRoot extends Entity implements IJsonBackedObject {
@Nullable
public DirectoryAuditCollectionPage directoryAudits;

/**
* The Provisioning.
*
*/
@SerializedName(value = "provisioning", alternate = {"Provisioning"})
@Expose
@Nullable
public ProvisioningObjectSummaryCollectionPage provisioning;

/**
* The Restricted Sign Ins.
*
Expand Down Expand Up @@ -73,6 +84,10 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
directoryAudits = serializer.deserializeObject(json.get("directoryAudits"), DirectoryAuditCollectionPage.class);
}

if (json.has("provisioning")) {
provisioning = serializer.deserializeObject(json.get("provisioning"), ProvisioningObjectSummaryCollectionPage.class);
}

if (json.has("restrictedSignIns")) {
restrictedSignIns = serializer.deserializeObject(json.get("restrictedSignIns"), RestrictedSignInCollectionPage.class);
}
Expand Down
68 changes: 68 additions & 0 deletions src/main/java/com/microsoft/graph/models/ChannelIdentity.java
@@ -0,0 +1,68 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models;
import com.microsoft.graph.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the Channel Identity.
*/
public class ChannelIdentity implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

@Override
@Nonnull
public final AdditionalDataManager additionalDataManager() {
return additionalDataManager;
}

/**
* The Channel Id.
* The identity of the channel in which the message was posted.
*/
@SerializedName(value = "channelId", alternate = {"ChannelId"})
@Expose
@Nullable
public String channelId;

/**
* The Team Id.
* The identity of the team in which the message was posted.
*/
@SerializedName(value = "teamId", alternate = {"TeamId"})
@Expose
@Nullable
public String teamId;


/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {

}
}

0 comments on commit 4638206

Please sign in to comment.