diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..34252a4 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,13 @@ +name: Merge Workflow + +on: + push: + branches: [main] + workflow_dispatch: + +jobs: + merge_job: + name: Merge Job + if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' + uses: frankhaugen/Workflows/.github/workflows/dotnet-publish-preview.yml@main + secrets: inherit diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 0000000..cd46667 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,13 @@ +name: Pull Request Workflow + +on: + pull_request: + branches: [main] + workflow_dispatch: + +jobs: + pull_request_job: + name: Pull Request Job + if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' + uses: frankhaugen/Workflows/.github/workflows/dotnet-pull-request.yml@main + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..ea1347d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,14 @@ +name: Release Workflow + +on: + release: + types: [published] + workflow_dispatch: + +jobs: + release_job: + name: Release Job + if: github.event_name == 'release' || github.event_name == 'workflow_dispatch' + uses: frankhaugen/Workflows/.github/workflows/dotnet-publish-release.yml@main + secrets: inherit + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..104b544 --- /dev/null +++ b/.gitignore @@ -0,0 +1,484 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from `dotnet new gitignore` + +# dotenv files +.env + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml +.idea + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# Vim temporary swap files +*.swp diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..41b4cb5 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,37 @@ + + + net8.0 + enable + enable + true + + true + $(NoWarn);1591 + + true + portable + false + + Frank R. Haugen + Frank R. Haugen + Copyright (c) 2024 Frank R. Haugen + + README.md + icon.png + true + MIT + https://www.github.com/frankhaugen/Frank.Channels.DependencyInjection + + https://www.github.com/frankhaugen/Frank.Channels.DependencyInjection + git + + + + + + + + + + + \ No newline at end of file diff --git a/Frank.Channels.DependencyInjection.Tests/Frank.Channels.DependencyInjection.Tests.csproj b/Frank.Channels.DependencyInjection.Tests/Frank.Channels.DependencyInjection.Tests.csproj new file mode 100644 index 0000000..9235a83 --- /dev/null +++ b/Frank.Channels.DependencyInjection.Tests/Frank.Channels.DependencyInjection.Tests.csproj @@ -0,0 +1,31 @@ + + + + net8.0 + enable + enable + + false + true + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/Frank.Channels.DependencyInjection.Tests/GlobalUsings.cs b/Frank.Channels.DependencyInjection.Tests/GlobalUsings.cs new file mode 100644 index 0000000..8c927eb --- /dev/null +++ b/Frank.Channels.DependencyInjection.Tests/GlobalUsings.cs @@ -0,0 +1 @@ +global using Xunit; \ No newline at end of file diff --git a/Frank.Channels.DependencyInjection.Tests/MyDto.cs b/Frank.Channels.DependencyInjection.Tests/MyDto.cs new file mode 100644 index 0000000..710ec9a --- /dev/null +++ b/Frank.Channels.DependencyInjection.Tests/MyDto.cs @@ -0,0 +1,6 @@ +namespace Frank.Channels.DependencyInjection.Tests; + +public class MyDto +{ + public string Name { get; set; } +} \ No newline at end of file diff --git a/Frank.Channels.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs b/Frank.Channels.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs new file mode 100644 index 0000000..4e12f2b --- /dev/null +++ b/Frank.Channels.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs @@ -0,0 +1,65 @@ +using System.Threading.Channels; +using FluentAssertions; +using Frank.Testing.TestBases; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Xunit.Abstractions; + +namespace Frank.Channels.DependencyInjection.Tests; + +public class ServiceCollectionExtensionsTests : HostApplicationTestBase +{ + private readonly ITestOutputHelper _outputHelper; + public ServiceCollectionExtensionsTests(ITestOutputHelper outputHelper) : base(outputHelper) + { + _outputHelper = outputHelper; + } + + private readonly List _dtos = new(); + + protected override Task SetupAsync(HostApplicationBuilder builder) + { + builder.Services.AddChannel(); + builder.Services.AddSingleton(_dtos); + builder.Services.AddHostedService(); + return Task.CompletedTask; + } + + + [Fact] + public async Task Test1() + { + var myDto = new MyDto { Name = "Test" }; + var channel = Services.GetRequiredService>(); + + for (int i = 0; i < 10000; i++) + { + await channel.WriteAsync(myDto); + } + + _dtos.Should().Contain(myDto); + _outputHelper.WriteLine($"_dtos.Count: {_dtos.Count}"); + } + + private class MyChannelListener : BackgroundService + { + private readonly ChannelReader _channelReader; + private readonly List _dtos; + + public MyChannelListener(ChannelReader channelReader, List dtos) + { + _channelReader = channelReader; + _dtos = dtos; + } + + /// + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + while (await _channelReader.WaitToReadAsync(stoppingToken)) + { + var dto = await _channelReader.ReadAsync(stoppingToken); + _dtos.Add(dto); + } + } + } +} \ No newline at end of file diff --git a/Frank.Channels.DependencyInjection.sln b/Frank.Channels.DependencyInjection.sln new file mode 100644 index 0000000..28c440d --- /dev/null +++ b/Frank.Channels.DependencyInjection.sln @@ -0,0 +1,37 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frank.Channels.DependencyInjection", "Frank.Channels.DependencyInjection\Frank.Channels.DependencyInjection.csproj", "{0E9A06D2-B295-4CDD-B09D-7B8076AA6134}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0DCD4245-3392-4E0C-861B-9712D9DA5545}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + Directory.Build.props = Directory.Build.props + icon.png = icon.png + LICENSE = LICENSE + nuget.config = nuget.config + README.md = README.md + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frank.Channels.DependencyInjection.Tests", "Frank.Channels.DependencyInjection.Tests\Frank.Channels.DependencyInjection.Tests.csproj", "{1F3717EA-5B45-4F1A-B7F3-73D8FD12138F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E9A06D2-B295-4CDD-B09D-7B8076AA6134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E9A06D2-B295-4CDD-B09D-7B8076AA6134}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E9A06D2-B295-4CDD-B09D-7B8076AA6134}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E9A06D2-B295-4CDD-B09D-7B8076AA6134}.Release|Any CPU.Build.0 = Release|Any CPU + {1F3717EA-5B45-4F1A-B7F3-73D8FD12138F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F3717EA-5B45-4F1A-B7F3-73D8FD12138F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F3717EA-5B45-4F1A-B7F3-73D8FD12138F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F3717EA-5B45-4F1A-B7F3-73D8FD12138F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Frank.Channels.DependencyInjection/ChannelFactory.cs b/Frank.Channels.DependencyInjection/ChannelFactory.cs new file mode 100644 index 0000000..29f470a --- /dev/null +++ b/Frank.Channels.DependencyInjection/ChannelFactory.cs @@ -0,0 +1,18 @@ +using System.Collections.Concurrent; +using System.Threading.Channels; + +namespace Frank.Channels.DependencyInjection; + +public class ChannelFactory : IChannelFactory +{ + private readonly ConcurrentDictionary _cache = new(); + + public Channel CreateChannel() where T : class => _cache.GetOrAdd(nameof(T), Value) as Channel ?? throw new InvalidOperationException($"{nameof(Channel)} not found"); + + private static Channel Value(string arg) where T : class => + Channel.CreateUnbounded(new UnboundedChannelOptions() + { + SingleReader = true, + SingleWriter = true + }); +} \ No newline at end of file diff --git a/Frank.Channels.DependencyInjection/Frank.Channels.DependencyInjection.csproj b/Frank.Channels.DependencyInjection/Frank.Channels.DependencyInjection.csproj new file mode 100644 index 0000000..cd696e1 --- /dev/null +++ b/Frank.Channels.DependencyInjection/Frank.Channels.DependencyInjection.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/Frank.Channels.DependencyInjection/IChannelFactory.cs b/Frank.Channels.DependencyInjection/IChannelFactory.cs new file mode 100644 index 0000000..9d5a450 --- /dev/null +++ b/Frank.Channels.DependencyInjection/IChannelFactory.cs @@ -0,0 +1,8 @@ +using System.Threading.Channels; + +namespace Frank.Channels.DependencyInjection; + +public interface IChannelFactory +{ + Channel CreateChannel() where T : class; +} \ No newline at end of file diff --git a/Frank.Channels.DependencyInjection/ServiceCollectionExtensions.cs b/Frank.Channels.DependencyInjection/ServiceCollectionExtensions.cs new file mode 100644 index 0000000..02bde51 --- /dev/null +++ b/Frank.Channels.DependencyInjection/ServiceCollectionExtensions.cs @@ -0,0 +1,42 @@ +using System.Threading.Channels; +using Microsoft.Extensions.DependencyInjection; + +namespace Frank.Channels.DependencyInjection; + +public static class ServiceCollectionExtensions +{ + internal static bool Contains(this IServiceCollection services) + { + return services.Any(descriptor => descriptor.ServiceType == typeof(TService)); + } + + internal static IServiceCollection AddSingletonIfNotExists(this IServiceCollection services) where TService : class where TImplementation : class, TService + { + if (!services.Contains()) + services.AddSingleton(); + return services; + } + + /// + /// Adds a channel of type to the service collection. + /// + /// + /// The channel is added as a singleton with its reader and writer as singletons, and injected as follows: + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static IServiceCollection AddChannel(this IServiceCollection services) where T : class + { + services.AddSingletonIfNotExists(); + services.AddSingleton>(provider => provider.GetRequiredService().CreateChannel()); + services.AddSingleton>(provider => provider.GetRequiredService>().Reader); + services.AddSingleton>(provider => provider.GetRequiredService>().Writer); + return services; + } +} \ No newline at end of file diff --git a/README.md b/README.md index 964ea09..89c8888 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,30 @@ # Frank.Channels.DependencyInjection A tiny library for having Channel<T> as a Dependency Injection resource in a sane manner + +___ +[![GitHub License](https://img.shields.io/github/license/frankhaugen/Frank.Channels.DependencyInjection)](LICENSE) +[![NuGet](https://img.shields.io/nuget/v/Frank.Channels.DependencyInjection.svg)](https://www.nuget.org/packages/Frank.Channels.DependencyInjection) +[![NuGet](https://img.shields.io/nuget/dt/Frank.Channels.DependencyInjection.svg)](https://www.nuget.org/packages/Frank.Channels.DependencyInjection) + +![GitHub contributors](https://img.shields.io/github/contributors/frankhaugen/Frank.Channels.DependencyInjection) +![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/frankhaugen/Frank.Channels.DependencyInjection) +![GitHub last commit](https://img.shields.io/github/last-commit/frankhaugen/Frank.Channels.DependencyInjection) +![GitHub commit activity](https://img.shields.io/github/commit-activity/m/frankhaugen/Frank.Channels.DependencyInjection) +![GitHub pull requests](https://img.shields.io/github/issues-pr/frankhaugen/Frank.Channels.DependencyInjection) +![GitHub issues](https://img.shields.io/github/issues/frankhaugen/Frank.Channels.DependencyInjection) +![GitHub closed issues](https://img.shields.io/github/issues-closed/frankhaugen/Frank.Channels.DependencyInjection) +___ + +## Usage + +```csharp +using Frank.Channels.DependencyInjection; + +// Register the channel of a type as a dependency: +services.AddChannel(); + +// Use the channel as a dependency in various ways: +var channel = provider.GetRequiredService>(); +var channelWriter = provider.GetRequiredService>(); +var channelReader = provider.GetRequiredService>(); +``` \ No newline at end of file diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..3c5d98a Binary files /dev/null and b/icon.png differ diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..d118941 --- /dev/null +++ b/nuget.config @@ -0,0 +1,8 @@ + + + + + + + +