Skip to content

fix: update to use non obsolete constructors and methods #2640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2024
Merged

fix: update to use non obsolete constructors and methods #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Microsoft.Graph/GraphServiceClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace Microsoft.Graph
using Microsoft.Graph.Requests;
using Microsoft.Graph.Core.Requests;
using Microsoft.Kiota.Abstractions.Authentication;
using Microsoft.Kiota.Authentication.Azure;
using Microsoft.Kiota.Abstractions;
using Azure.Core;

Expand Down Expand Up @@ -48,7 +47,7 @@ public GraphServiceClient(
TokenCredential tokenCredential,
IEnumerable<string> scopes = null,
string baseUrl = null
):this(new Microsoft.Graph.Authentication.AzureIdentityAuthenticationProvider(tokenCredential, null, null,scopes?.ToArray() ?? Array.Empty<string>()), baseUrl)
):this(new Microsoft.Graph.Authentication.AzureIdentityAuthenticationProvider(tokenCredential, null, null,true,scopes?.ToArray() ?? []), baseUrl)
{
}

Expand All @@ -64,7 +63,7 @@ public GraphServiceClient(
TokenCredential tokenCredential,
IEnumerable<string> scopes = null,
string baseUrl = null
):this(httpClient, new Microsoft.Graph.Authentication.AzureIdentityAuthenticationProvider(tokenCredential, null, null, scopes?.ToArray() ?? Array.Empty<string>()), baseUrl)
):this(httpClient, new Microsoft.Graph.Authentication.AzureIdentityAuthenticationProvider(tokenCredential, null, null,true, scopes?.ToArray() ?? []), baseUrl)
{
}

Expand Down
107 changes: 40 additions & 67 deletions tests/Microsoft.Graph.DotnetCore.Test/Models/ModelSerializationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
namespace Microsoft.Graph.DotnetCore.Test.Models
{
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using Microsoft.Graph.Models;
using Microsoft.Kiota.Abstractions;
using Microsoft.Kiota.Abstractions.Serialization;
using Microsoft.Kiota.Serialization.Json;
using System.Collections.Generic;
using System.IO;
using System.Text;

public class ModelSerializationTests
{
private readonly JsonParseNodeFactory parseNodeFactory;

public ModelSerializationTests()
{
this.parseNodeFactory = new JsonParseNodeFactory();
SerializationWriterFactoryRegistry.DefaultInstance.ContentTypeAssociatedFactories["application/json"] = new JsonSerializationWriterFactory();
ParseNodeFactoryRegistry.DefaultInstance.ContentTypeAssociatedFactories["application/json"] = new JsonParseNodeFactory();
}

[Fact]
public void DeserializeDerivedType()
public async Task DeserializeDerivedType()
{
var userId = "userId";
var givenName = "name";
Expand All @@ -33,18 +33,15 @@ public void DeserializeDerivedType()
userId,
givenName);

var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(stringToDeserialize));
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
var user = parseNode.GetObjectValue<User>(User.CreateFromDiscriminatorValue);

var user = await KiotaJsonSerializer.DeserializeAsync<User>(stringToDeserialize);

Assert.NotNull(user);
Assert.Equal(userId, user.Id);
Assert.Equal(givenName, user.GivenName);
//Assert.Null(user.GetEtag());
}

[Fact]
public void DeserializeInvalidODataType()
public async Task DeserializeInvalidODataType()
{
var directoryObjectId = "directoryObjectId";
var givenName = "name";
Expand All @@ -54,18 +51,16 @@ public void DeserializeInvalidODataType()
directoryObjectId,
givenName);

var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(stringToDeserialize));
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
var directoryObject = parseNode.GetObjectValue<DirectoryObject>(DirectoryObject.CreateFromDiscriminatorValue);

var directoryObject = await KiotaJsonSerializer.DeserializeAsync<DirectoryObject>(stringToDeserialize);

Assert.NotNull(directoryObject);
Assert.Equal(directoryObjectId, directoryObject.Id);
Assert.NotNull(directoryObject.AdditionalData);
Assert.Equal(givenName, directoryObject.AdditionalData["givenName"].ToString());
}

[Fact(Skip = "TODO fix pending enum handling bug")]
public void DeserializeUnknownEnumValue()
[Fact]
public async Task DeserializeUnknownEnumValue()
{
var enumValue = "newValue";
var bodyContent = "bodyContent";
Expand All @@ -75,35 +70,30 @@ public void DeserializeUnknownEnumValue()
bodyContent,
enumValue);

var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(stringToDeserialize));
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
var itemBody = parseNode.GetObjectValue<ItemBody>(ItemBody.CreateFromDiscriminatorValue);
var itemBody = await KiotaJsonSerializer.DeserializeAsync<ItemBody>(stringToDeserialize);

Assert.NotNull(itemBody);
Assert.Equal(bodyContent, itemBody.Content);
Assert.Null(itemBody.ContentType);
Assert.NotNull(itemBody.AdditionalData);
Assert.Equal(enumValue, itemBody.AdditionalData["contentType"].ToString());
}

[Fact]
public void DeserializeDateValue()
public async Task DeserializeDateValue()
{
var now = DateTimeOffset.UtcNow;

var stringToDeserialize = string.Format("{{\"startDate\":\"{0}\"}}", now.ToString("yyyy-MM-dd"));

var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(stringToDeserialize));
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
var recurrenceRange = parseNode.GetObjectValue<RecurrenceRange>(RecurrenceRange.CreateFromDiscriminatorValue);

var recurrenceRange = await KiotaJsonSerializer.DeserializeAsync<RecurrenceRange>(stringToDeserialize);

Assert.Equal(now.Year, recurrenceRange.StartDate.Value.Year);
Assert.Equal(now.Month, recurrenceRange.StartDate.Value.Month);
Assert.Equal(now.Day, recurrenceRange.StartDate.Value.Day);
}

[Fact]
public void NewAbstractEntityDerivedClassInstance()
public async Task NewAbstractEntityDerivedClassInstance()
{
var entityId = "entityId";
var additionalKey = "key";
Expand All @@ -115,18 +105,16 @@ public void NewAbstractEntityDerivedClassInstance()
additionalKey,
additionalValue);

var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(stringToDeserialize));
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
var entity = parseNode.GetObjectValue<Entity>(Entity.CreateFromDiscriminatorValue);
var entity = await KiotaJsonSerializer.DeserializeAsync<Entity>(stringToDeserialize);

Assert.NotNull(entity);
Assert.Equal(entityId, entity.Id);
Assert.NotNull(entity.AdditionalData);
Assert.Equal(additionalValue, entity.AdditionalData[additionalKey].ToString());
}

[Fact(Skip = "TODO fix pending enum handling bug")]
public void SerializeAndDeserializeKnownEnumValue()
[Fact]
public async Task SerializeAndDeserializeKnownEnumValue()
{
var itemBody = new ItemBody
{
Expand All @@ -140,28 +128,23 @@ public void SerializeAndDeserializeKnownEnumValue()
itemBody.Content,
"text");

// Serialize
using var jsonSerializerWriter = new JsonSerializationWriter();
jsonSerializerWriter.WriteObjectValue(string.Empty, itemBody);
var serializedStream = jsonSerializerWriter.GetSerializedContent();
// Serialize=
var serializedString = await KiotaJsonSerializer.SerializeAsStringAsync(itemBody, CancellationToken.None);

//Assert
var streamReader = new StreamReader(serializedStream);
Assert.Equal(expectedSerializedStream, streamReader.ReadToEnd());
Assert.Equal(expectedSerializedStream, serializedString);

// De serialize
serializedStream.Position = 0; //reset the stream to be read again
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, serializedStream);
var newItemBody = parseNode.GetObjectValue<ItemBody>(ItemBody.CreateFromDiscriminatorValue);
var newItemBody = await KiotaJsonSerializer.DeserializeAsync<ItemBody>(serializedString);

Assert.NotNull(newItemBody);
Assert.Equal(itemBody.Content, itemBody.Content);
Assert.Equal(BodyType.Text, itemBody.ContentType);
Assert.Null(itemBody.AdditionalData);
Assert.NotNull(itemBody.AdditionalData);
}

[Fact]
public void SerializeDateValue()
public async Task SerializeDateValue()
{
var now = DateTimeOffset.UtcNow;

Expand All @@ -172,16 +155,13 @@ public void SerializeDateValue()
StartDate = new Date(now.Year, now.Month, now.Day),
};

using var jsonSerializerWriter = new JsonSerializationWriter();
jsonSerializerWriter.WriteObjectValue(string.Empty, recurrence);
var serializedStream = jsonSerializerWriter.GetSerializedContent();
var serializedString = await KiotaJsonSerializer.SerializeAsStringAsync(recurrence, CancellationToken.None);

// Assert
var streamReader = new StreamReader(serializedStream);
Assert.Equal(expectedSerializedString, streamReader.ReadToEnd());
Assert.Equal(expectedSerializedString, serializedString);
}
[Fact]
public void TestEtagHelper()
public async Task TestEtagHelper()
{
var userId = "userId";
var testEtag = "testEtag";
Expand All @@ -191,16 +171,14 @@ public void TestEtagHelper()
userId,
testEtag);

var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(stringToDeserialize));
var parseNode = this.parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, memoryStream);
var user = parseNode.GetObjectValue<Entity>(Entity.CreateFromDiscriminatorValue);

var user = await KiotaJsonSerializer.DeserializeAsync<Entity>(stringToDeserialize);

Assert.NotNull(user);
Assert.Equal(userId, user.Id);
//Assert.Equal(testEtag, user.GetEtag());
}
[Fact]
public void TestPlannerAssigmentSerialization()
public async Task TestPlannerAssigmentSerialization()
{
var planTask = new PlannerTask
{
Expand All @@ -217,17 +195,14 @@ public void TestPlannerAssigmentSerialization()
};

string expectedSerializedString = "{\"assignments\":{\"USER_ID\":{\"@odata.type\":\"#microsoft.graph.plannerAssignment\",\"orderHint\":\"!\"}},\"bucketId\":\"BUCKET_ID\",\"planId\":\"PLAN_ID\",\"title\":\"My Planner Task\"}";
using var jsonSerializerWriter = new JsonSerializationWriter();
jsonSerializerWriter.WriteObjectValue(string.Empty, planTask);
var serializedStream = jsonSerializerWriter.GetSerializedContent();

// Assert
var streamReader = new StreamReader(serializedStream);
Assert.Equal(expectedSerializedString, streamReader.ReadToEnd());
var serializedString = await KiotaJsonSerializer.SerializeAsStringAsync(planTask, CancellationToken.None);
Assert.Equal(expectedSerializedString, serializedString);
}

[Fact]
public void TestChangeNoticationCollectionDeserialization()
public async Task TestChangeNoticationCollectionDeserialization()
{
var json = @"{
""value"": [
Expand All @@ -251,11 +226,9 @@ public void TestChangeNoticationCollectionDeserialization()
""eyJ0eXAiOiJKV1...""
]
}";

using var memStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(json));
var parseNode = new JsonParseNodeFactory().GetRootParseNode("application/json", memStream);
var changeNotifications = parseNode.GetObjectValue(ChangeNotificationCollection.CreateFromDiscriminatorValue);


var changeNotifications = await KiotaJsonSerializer.DeserializeAsync<ChangeNotificationCollection>(json, CancellationToken.None);

Assert.NotNull(changeNotifications.Value);
Assert.Single(changeNotifications.Value);
Assert.NotNull(changeNotifications.ValidationTokens);
Expand Down
10 changes: 4 additions & 6 deletions tests/Microsoft.Graph.DotnetCore.Test/Requests/Functional/OneNoteTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ namespace Microsoft.Graph.DotnetCore.Test.Requests.Functional
using System.IO;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using System.Collections.Generic;
using System.Net.Http.Headers;
using Microsoft.Graph.DotnetCore.Test.Requests.Functional.Resources;
using Microsoft.Graph.Models.ODataErrors;
using Microsoft.Kiota.Abstractions.Serialization;

public class OneNoteTests : GraphTestBase
{
Expand Down Expand Up @@ -357,9 +359,7 @@ public async Task OneNoteAddPageHtmlWorkaround()
{
// Deserialize into OneNotePage object.
var content = await response.Content.ReadAsStreamAsync();
var parseNodeFactory = new JsonParseNodeFactory();
var parseNode = parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, content);
testPage = parseNode.GetObjectValue<OnenotePage>(OnenotePage.CreateFromDiscriminatorValue);
testPage = await KiotaJsonSerializer.DeserializeAsync<OnenotePage>(content, CancellationToken.None);

Assert.NotNull(testPage);
Assert.Contains(testPage.Title, title);
Expand Down Expand Up @@ -413,9 +413,7 @@ public async Task OneNoteAddPageHtmlWithStreamWorkaround()
// Deserialize into OneNotePage object.
// Send the request and get the response.
var content = await graphClient.RequestAdapter.SendPrimitiveAsync<Stream>(requestInformation);
var parseNodeFactory = new JsonParseNodeFactory();
var parseNode = parseNodeFactory.GetRootParseNode(CoreConstants.MimeTypeNames.Application.Json, content);
testPage = parseNode.GetObjectValue<OnenotePage>(OnenotePage.CreateFromDiscriminatorValue);
testPage = await KiotaJsonSerializer.DeserializeAsync<OnenotePage>(content, CancellationToken.None);

Assert.NotNull(testPage);
Assert.Contains(testPage.Title, title);
Expand Down