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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:

sudo apt-get install xmlstarlet

version_number=$(xmlstarlet sel -t -v "//Version" -n NHS.Digital.ApiPlatform.Sdk/NHS.Digital.ApiPlatform.Sdk.csproj)
version_number=$(xmlstarlet sel -t -v "//Version" -n NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj)

echo "$version_number"

Expand All @@ -96,7 +96,7 @@ jobs:

sudo apt-get install xmlstarlet

package_release_notes=$(xmlstarlet sel -t -v "//PackageReleaseNotes" -n NHS.Digital.ApiPlatform.Sdk/NHS.Digital.ApiPlatform.Sdk.csproj)
package_release_notes=$(xmlstarlet sel -t -v "//PackageReleaseNotes" -n NHSDigital.ApiPlatform.Sdk/NHSDigital.ApiPlatform.Sdk.csproj)

echo "$package_release_notes"

Expand Down
25 changes: 0 additions & 25 deletions NHS.Digital.ApiPlatform.slnx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Copyright (c) North East London ICB. All rights reserved.
// ---------------------------------------------------------

using NHS.Digital.ApiPlatform.Infrastructure.Services;
using NHSDigital.ApiPlatform.Infrastructure.Services;

namespace NHS.Digital.ApiPlatform.Infrastructure
namespace NHSDigital.ApiPlatform.Infrastructure
{
internal class Program
{
Expand All @@ -14,7 +14,7 @@ static void Main(string[] args)

scriptGenerationService.GenerateBuildScript(
branchName: "main",
projectName: "NHS.Digital.ApiPlatform.Sdk",
projectName: "NHSDigital.ApiPlatform.Sdk",
dotNetVersion: "10.0.100");

scriptGenerationService.GeneratePrLintScript(branchName: "main");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks;
using ADotNet.Models.Pipelines.GithubPipelines.DotNets.Tasks.SetupDotNetTaskV3s;

namespace NHS.Digital.ApiPlatform.Infrastructure.Services
namespace NHSDigital.ApiPlatform.Infrastructure.Services
{
internal class ScriptGenerationService
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk.AspNetCore\NHS.Digital.ApiPlatform.Sdk.AspNetCore.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk.AspNetCore\NHSDigital.ApiPlatform.Sdk.AspNetCore.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk.AspNetCore\NHS.Digital.ApiPlatform.Sdk.AspNetCore.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk.AspNetCore\NHSDigital.ApiPlatform.Sdk.AspNetCore.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk.AspNetCore\NHS.Digital.ApiPlatform.Sdk.AspNetCore.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk.AspNetCore\NHSDigital.ApiPlatform.Sdk.AspNetCore.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using NHS.Digital.ApiPlatform.Sdk.Brokers.Storages;
using NHSDigital.ApiPlatform.Sdk.Brokers.Storages;

namespace NHS.Digital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages
namespace NHSDigital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages
{
internal sealed class SessionApiPlatformStateBroker : IApiPlatformStateBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) North East London ICB. All rights reserved.
// ---------------------------------------------------------

namespace NHS.Digital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages
namespace NHSDigital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages
{
internal static class SessionApiPlatformStorageKeys
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using NHS.Digital.ApiPlatform.Sdk.Brokers.Storages;
using NHSDigital.ApiPlatform.Sdk.Brokers.Storages;

namespace NHS.Digital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages
namespace NHSDigital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages
{
internal sealed class SessionApiPlatformTokenBroker : IApiPlatformTokenBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>

<Title>NHS.Digital.ApiPlatform.Sdk.AspNetCore</Title>
<Product>NHS.Digital.ApiPlatform.Sdk.AspNetCore</Product>
<PackageId>NHS.Digital.ApiPlatform.Sdk.AspNetCore</PackageId>
<Title>NHSDigital.ApiPlatform.Sdk.AspNetCore</Title>
<Product>NHSDigital.ApiPlatform.Sdk.AspNetCore</Product>
<PackageId>NHSDigital.ApiPlatform.Sdk.AspNetCore</PackageId>
<Authors>North East London ICB</Authors>
<Company>North East London ICB</Company>
<Description>
NHS Digital API Platform Client.
</Description>
<Copyright>North East London ICB - 2026 (c)</Copyright>
<PackageIcon>NhsDigitalIcon.png</PackageIcon>
<PackageProjectUrl>https://github.com/NHSISL/NHS.Digital.ApiPlatform</PackageProjectUrl>
<RepositoryUrl>https://github.com/NHSISL/NHS.Digital.ApiPlatform</RepositoryUrl>
<PackageProjectUrl>https://github.com/NHSISL/NHSDigital.ApiPlatform</PackageProjectUrl>
<RepositoryUrl>https://github.com/NHSISL/NHSDigital.ApiPlatform</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>NHSISL; NHS Digital; API; Platform; Client; .NET; The Standard;</PackageTags>
<PackageReleaseNotes>
Initial release of the NHS Digital API Platform Client.
</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<Version>0.2.0.0</Version>
<AssemblyVersion>0.2.0.0</AssemblyVersion>
<FileVersion>0.2.0.0</FileVersion>
<Version>0.2.0.1</Version>
<AssemblyVersion>0.2.0.1</AssemblyVersion>
<FileVersion>0.2.0.1</FileVersion>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<IsPackable>true</IsPackable>
Expand Down Expand Up @@ -54,13 +54,13 @@
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="NHS.Digital.ApiPlatform.Sdk.AspNetCore.Tests.Unit" />
<InternalsVisibleTo Include="NHS.Digital.ApiPlatform.Sdk.AspNetCore.Tests.Acceptance" />
<InternalsVisibleTo Include="NHSDigital.ApiPlatform.Sdk.AspNetCore.Tests.Unit" />
<InternalsVisibleTo Include="NHSDigital.ApiPlatform.Sdk.AspNetCore.Tests.Acceptance" />
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk\NHS.Digital.ApiPlatform.Sdk.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk\NHSDigital.ApiPlatform.Sdk.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# NHS.Digital.ApiPlatform.Sdk.AspNetCore
# NHSDigital.ApiPlatform.Sdk.AspNetCore

## Overview

`NHS.Digital.ApiPlatform.Sdk.AspNetCore` is the ASP.NET Core adapter
`NHSDigital.ApiPlatform.Sdk.AspNetCore` is the ASP.NET Core adapter
for:

`NHS.Digital.ApiPlatform.Sdk`
`NHSDigital.ApiPlatform.Sdk`

It provides:

Expand All @@ -19,8 +19,8 @@ It provides:
## Installation

``` bash
dotnet add package NHS.Digital.ApiPlatform.Sdk
dotnet add package NHS.Digital.ApiPlatform.Sdk.AspNetCore
dotnet add package NHSDigital.ApiPlatform.Sdk
dotnet add package NHSDigital.ApiPlatform.Sdk.AspNetCore
```

------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using NHS.Digital.ApiPlatform.Sdk.Brokers.Storages;
using NHS.Digital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages;
using NHSDigital.ApiPlatform.Sdk.Brokers.Storages;
using NHSDigital.ApiPlatform.Sdk.AspNetCore.Brokers.Storages;

namespace NHS.Digital.ApiPlatform.Sdk.AspNetCore
namespace NHSDigital.ApiPlatform.Sdk.AspNetCore
{
public static class ServiceCollectionExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk\NHS.Digital.ApiPlatform.Sdk.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk\NHSDigital.ApiPlatform.Sdk.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk\NHS.Digital.ApiPlatform.Sdk.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk\NHSDigital.ApiPlatform.Sdk.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Xunit;

namespace NHS.Digital.ApiPlatform.Sdk.Tests.Integration
namespace NHSDigital.ApiPlatform.Sdk.Tests.Integration
{
public partial class NhsLoginTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Xunit;

namespace NHS.Digital.ApiPlatform.Sdk.Tests.Integration
namespace NHSDigital.ApiPlatform.Sdk.Tests.Integration
{
public partial class NhsLoginTests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Threading.Tasks;
using NHS.Digital.ApiPlatform.Sdk.Models.Foundations.CareIdentityServices;
using NHSDigital.ApiPlatform.Sdk.Models.Foundations.CareIdentityServices;
using Xunit;

namespace NHS.Digital.ApiPlatform.Sdk.Tests.Integration
namespace NHSDigital.ApiPlatform.Sdk.Tests.Integration
{
public partial class NhsLoginTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Xunit;

namespace NHS.Digital.ApiPlatform.Sdk.Tests.Integration
namespace NHSDigital.ApiPlatform.Sdk.Tests.Integration
{
public partial class NhsLoginTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
// ---------------------------------------------------------

using Microsoft.Extensions.Configuration;
using NHS.Digital.ApiPlatform.Sdk.Clients.ApiPlatforms;
using NHS.Digital.ApiPlatform.Sdk.Clients.CareIdentityServices;
using NHS.Digital.ApiPlatform.Sdk.Models.Configurations;
using NHSDigital.ApiPlatform.Sdk.Clients.ApiPlatforms;
using NHSDigital.ApiPlatform.Sdk.Clients.CareIdentityServices;
using NHSDigital.ApiPlatform.Sdk.Models.Configurations;
using Xunit.Abstractions;

namespace NHS.Digital.ApiPlatform.Sdk.Tests.Integration
namespace NHSDigital.ApiPlatform.Sdk.Tests.Integration
{
public partial class NhsLoginTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NHS.Digital.ApiPlatform.Sdk\NHS.Digital.ApiPlatform.Sdk.csproj" />
<ProjectReference Include="..\NHSDigital.ApiPlatform.Sdk\NHSDigital.ApiPlatform.Sdk.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.Security.Cryptography;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Cryptographies
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Cryptographies
{
internal sealed class CryptoBroker : ICryptoBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) North East London ICB. All rights reserved.
// ---------------------------------------------------------

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Cryptographies
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Cryptographies
{
public interface ICryptoBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ---------------------------------------------------------
using System;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.DateTimes
namespace NHSDigital.ApiPlatform.Sdk.Brokers.DateTimes
{
internal class DateTimeBroker : IDateTimeBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using System;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.DateTimes
namespace NHSDigital.ApiPlatform.Sdk.Brokers.DateTimes
{
internal interface IDateTimeBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Https
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Https
{
internal sealed class HttpBroker : IHttpBroker
{
Expand All @@ -29,7 +29,7 @@

public async ValueTask<HttpResponseMessage> GetAsync(
string url,
Action<HttpRequestMessage>? configureRequest,

Check warning on line 32 in NHSDigital.ApiPlatform.Sdk/Brokers/Https/HttpBroker.cs

View workflow job for this annotation

GitHub Actions / Build

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 32 in NHSDigital.ApiPlatform.Sdk/Brokers/Https/HttpBroker.cs

View workflow job for this annotation

GitHub Actions / Build

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 32 in NHSDigital.ApiPlatform.Sdk/Brokers/Https/HttpBroker.cs

View workflow job for this annotation

GitHub Actions / Publish to NuGet

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
CancellationToken cancellationToken)
{
HttpClient client = this.httpClientFactory.CreateClient("NhsApiPlatform");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Https
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Https
{
public interface IHttpBroker
{
Expand All @@ -18,7 +18,7 @@

ValueTask<HttpResponseMessage> GetAsync(
string url,
Action<HttpRequestMessage>? configureRequest,

Check warning on line 21 in NHSDigital.ApiPlatform.Sdk/Brokers/Https/IHttpBroker.cs

View workflow job for this annotation

GitHub Actions / Build

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 21 in NHSDigital.ApiPlatform.Sdk/Brokers/Https/IHttpBroker.cs

View workflow job for this annotation

GitHub Actions / Build

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 21 in NHSDigital.ApiPlatform.Sdk/Brokers/Https/IHttpBroker.cs

View workflow job for this annotation

GitHub Actions / Publish to NuGet

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
CancellationToken cancellationToken);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ---------------------------------------------------------
using System;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Identifiers
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Identifiers
{
public interface IIdentifierBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ---------------------------------------------------------
using System;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Identifiers
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Identifiers
{
internal sealed class IdentifierBroker : IIdentifierBroker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Copyright (c) North East London ICB. All rights reserved.
// ---------------------------------------------------------

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Serializations
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Serializations
{
public interface IJsonBroker
{
T? Deserialize<T>(string json);

Check warning on line 9 in NHSDigital.ApiPlatform.Sdk/Brokers/Serializations/IJsonBroker.cs

View workflow job for this annotation

GitHub Actions / Build

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 9 in NHSDigital.ApiPlatform.Sdk/Brokers/Serializations/IJsonBroker.cs

View workflow job for this annotation

GitHub Actions / Publish to NuGet

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
string Serialize(object value);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

using System.Text.Json;

namespace NHS.Digital.ApiPlatform.Sdk.Brokers.Serializations
namespace NHSDigital.ApiPlatform.Sdk.Brokers.Serializations
{
internal sealed class JsonBroker : IJsonBroker
{
private static readonly JsonSerializerOptions Options = new(JsonSerializerDefaults.Web);

public T? Deserialize<T>(string json) =>

Check warning on line 13 in NHSDigital.ApiPlatform.Sdk/Brokers/Serializations/JsonBroker.cs

View workflow job for this annotation

GitHub Actions / Build

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 13 in NHSDigital.ApiPlatform.Sdk/Brokers/Serializations/JsonBroker.cs

View workflow job for this annotation

GitHub Actions / Publish to NuGet

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
JsonSerializer.Deserialize<T>(json, Options);

public string Serialize(object value) =>
Expand Down
Loading
Loading