Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {

dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph:2.8.1'
implementation 'com.microsoft.graph:microsoft-graph:2.9.0'
}
```

Expand All @@ -31,7 +31,7 @@ Add the dependency in `dependencies` in pom.xml
<dependency>
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>2.8.1</version>
<version>2.9.0</version>
</dependency>
```

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




5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ org.gradle.caching=true
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 2
mavenMinorVersion = 8
mavenPatchVersion = 1
mavenMinorVersion = 9
mavenPatchVersion = 0
mavenArtifactSuffix =

#These values are used to run functional tests
Expand All @@ -47,3 +47,4 @@ mavenCentralPublishingEnabled=false




3 changes: 2 additions & 1 deletion src/main/java/com/microsoft/graph/core/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ private Constants() {
public static final String PASSWORD = "password";
public static final String TENANTID = "tenantid";
public static final String CLIENTSECRET = "clientsecret";
public static final String VERSION_NAME = "2.8.1";
public static final String VERSION_NAME = "2.9.0";
}







Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ public class AadUserConversationMember extends ConversationMember implements IJs
@Expose
public String email;

/**
* The Tenant Id.
* TenantId which the Azure AD user belongs to.
*/
@SerializedName(value = "tenantId", alternate = {"TenantId"})
@Expose
public String tenantId;

/**
* The User Id.
* The GUID of the user.
Expand Down
144 changes: 144 additions & 0 deletions src/main/java/com/microsoft/graph/models/extensions/Agreement.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
// 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.extensions;
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.extensions.TermsExpiration;
import com.microsoft.graph.models.extensions.AgreementAcceptance;
import com.microsoft.graph.models.extensions.AgreementFile;
import com.microsoft.graph.models.extensions.AgreementFileLocalization;
import com.microsoft.graph.models.extensions.Entity;
import com.microsoft.graph.requests.extensions.AgreementAcceptanceCollectionPage;
import com.microsoft.graph.requests.extensions.AgreementFileLocalizationCollectionPage;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

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

/**
* The class for the Agreement.
*/
public class Agreement extends Entity implements IJsonBackedObject {


/**
* The Display Name.
* Display name of the agreement. The display name is used for internal tracking of the agreement but is not shown to end users who view the agreement.
*/
@SerializedName(value = "displayName", alternate = {"DisplayName"})
@Expose
public String displayName;

/**
* The Is Per Device Acceptance Required.
* This setting enables you to require end users to accept this agreement on every device that they are accessing it from. The end user will be required to register their device in Azure AD, if they haven't already done so.
*/
@SerializedName(value = "isPerDeviceAcceptanceRequired", alternate = {"IsPerDeviceAcceptanceRequired"})
@Expose
public Boolean isPerDeviceAcceptanceRequired;

/**
* The Is Viewing Before Acceptance Required.
* Indicates whether the user has to expand the agreement before accepting.
*/
@SerializedName(value = "isViewingBeforeAcceptanceRequired", alternate = {"IsViewingBeforeAcceptanceRequired"})
@Expose
public Boolean isViewingBeforeAcceptanceRequired;

/**
* The Terms Expiration.
* Expiration schedule and frequency of agreement for all users.
*/
@SerializedName(value = "termsExpiration", alternate = {"TermsExpiration"})
@Expose
public TermsExpiration termsExpiration;

/**
* The User Reaccept Required Frequency.
* The duration after which the user must re-accept the terms of use. The value is represented in ISO 8601 format for durations.
*/
@SerializedName(value = "userReacceptRequiredFrequency", alternate = {"UserReacceptRequiredFrequency"})
@Expose
public javax.xml.datatype.Duration userReacceptRequiredFrequency;

/**
* The Acceptances.
* Read-only. Information about acceptances of this agreement.
*/
@SerializedName(value = "acceptances", alternate = {"Acceptances"})
@Expose
public AgreementAcceptanceCollectionPage acceptances;

/**
* The File.
* Default PDF linked to this agreement.
*/
@SerializedName(value = "file", alternate = {"File"})
@Expose
public AgreementFile file;

/**
* The Files.
* PDFs linked to this agreement. Note: This property is in the process of being deprecated. Use the file property instead.
*/
@SerializedName(value = "files", alternate = {"Files"})
@Expose
public AgreementFileLocalizationCollectionPage files;


/**
* The raw representation of this class
*/
private JsonObject rawObject;

/**
* The serializer
*/
private ISerializer serializer;

/**
* Gets the raw representation of this class
*
* @return the raw representation of this class
*/
public JsonObject getRawObject() {
return rawObject;
}

/**
* Gets serializer
*
* @return the serializer
*/
protected ISerializer getSerializer() {
return serializer;
}

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


if (json.has("acceptances")) {
acceptances = serializer.deserializeObject(json.get("acceptances").toString(), AgreementAcceptanceCollectionPage.class);
}

if (json.has("files")) {
files = serializer.deserializeObject(json.get("files").toString(), AgreementFileLocalizationCollectionPage.class);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
// 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.extensions;
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.generated.AgreementAcceptanceState;
import com.microsoft.graph.models.extensions.Entity;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

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

/**
* The class for the Agreement Acceptance.
*/
public class AgreementAcceptance extends Entity implements IJsonBackedObject {


/**
* The Agreement File Id.
* ID of the agreement file accepted by the user.
*/
@SerializedName(value = "agreementFileId", alternate = {"AgreementFileId"})
@Expose
public String agreementFileId;

/**
* The Agreement Id.
* ID of the agreement.
*/
@SerializedName(value = "agreementId", alternate = {"AgreementId"})
@Expose
public String agreementId;

/**
* The Device Display Name.
* The display name of the device used for accepting the agreement.
*/
@SerializedName(value = "deviceDisplayName", alternate = {"DeviceDisplayName"})
@Expose
public String deviceDisplayName;

/**
* The Device Id.
* The unique identifier of the device used for accepting the agreement.
*/
@SerializedName(value = "deviceId", alternate = {"DeviceId"})
@Expose
public String deviceId;

/**
* The Device OSType.
* The operating system used for accepting the agreement.
*/
@SerializedName(value = "deviceOSType", alternate = {"DeviceOSType"})
@Expose
public String deviceOSType;

/**
* The Device OSVersion.
* The operating system version of the device used for accepting the agreement.
*/
@SerializedName(value = "deviceOSVersion", alternate = {"DeviceOSVersion"})
@Expose
public String deviceOSVersion;

/**
* The Expiration Date Time.
* The expiration date time of the acceptance. 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 would look like this: '2014-01-01T00:00:00Z'
*/
@SerializedName(value = "expirationDateTime", alternate = {"ExpirationDateTime"})
@Expose
public java.util.Calendar expirationDateTime;

/**
* The Recorded Date Time.
* 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 would look like this: '2014-01-01T00:00:00Z'
*/
@SerializedName(value = "recordedDateTime", alternate = {"RecordedDateTime"})
@Expose
public java.util.Calendar recordedDateTime;

/**
* The State.
* Possible values are: accepted, declined.
*/
@SerializedName(value = "state", alternate = {"State"})
@Expose
public AgreementAcceptanceState state;

/**
* The User Display Name.
* Display name of the user when the acceptance was recorded.
*/
@SerializedName(value = "userDisplayName", alternate = {"UserDisplayName"})
@Expose
public String userDisplayName;

/**
* The User Email.
* Email of the user when the acceptance was recorded.
*/
@SerializedName(value = "userEmail", alternate = {"UserEmail"})
@Expose
public String userEmail;

/**
* The User Id.
* ID of the user who accepted the agreement.
*/
@SerializedName(value = "userId", alternate = {"UserId"})
@Expose
public String userId;

/**
* The User Principal Name.
* UPN of the user when the acceptance was recorded.
*/
@SerializedName(value = "userPrincipalName", alternate = {"UserPrincipalName"})
@Expose
public String userPrincipalName;


/**
* The raw representation of this class
*/
private JsonObject rawObject;

/**
* The serializer
*/
private ISerializer serializer;

/**
* Gets the raw representation of this class
*
* @return the raw representation of this class
*/
public JsonObject getRawObject() {
return rawObject;
}

/**
* Gets serializer
*
* @return the serializer
*/
protected ISerializer getSerializer() {
return serializer;
}

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

}
}
Loading