diff --git a/.gitignore b/.gitignore index ddfdd9b..154e127 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,477 @@ -# Autosave files -*~ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore -# build -[Oo]bj/ +# 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/ -packages/ -TestResults/ +[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 + +## +## Visual studio for Mac +## + # globs Makefile.in -*.DS_Store -*.sln.cache -*.suo -*.cache -*.pidb *.userprefs *.usertasks -config.log config.make config.status aclocal.m4 install-sh autom4te.cache/ -*.user *.tar.gz tarballs/ test-results/ -Thumbs.db # Mac bundle stuff *.dmg *.app -# resharper -*_Resharper.* -*.Resharper - -# dotCover -*.dotCover +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General .DS_Store -.vscode/* +.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 diff --git a/PayPalHttp-Dotnet.Tests/PayPalHttp-Dotnet.Tests.csproj b/PayPalHttp-Dotnet.Tests/PayPalHttp-Dotnet.Tests.csproj index 39b47cc..2533e5b 100644 --- a/PayPalHttp-Dotnet.Tests/PayPalHttp-Dotnet.Tests.csproj +++ b/PayPalHttp-Dotnet.Tests/PayPalHttp-Dotnet.Tests.csproj @@ -1,6 +1,7 @@ - netcoreapp2.0 + net6.0 + 10.0 false diff --git a/PayPalHttp-Dotnet.sln b/PayPalHttp-Dotnet.sln index 140d868..5f31542 100644 --- a/PayPalHttp-Dotnet.sln +++ b/PayPalHttp-Dotnet.sln @@ -1,24 +1,33 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PayPalHttp-Dotnet.Tests", "PayPalHttp-Dotnet.Tests\PayPalHttp-Dotnet.Tests.csproj", "{721A137C-849F-4F38-8469-313FBDACA8A1}" +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33110.190 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PayPalHttp-Dotnet.Tests", "PayPalHttp-Dotnet.Tests\PayPalHttp-Dotnet.Tests.csproj", "{721A137C-849F-4F38-8469-313FBDACA8A1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PayPalHttp-Dotnet", "PayPalHttp-Dotnet\PayPalHttp-Dotnet.csproj", "{84E2B926-5A3B-4F95-9B63-291E0240C1B4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PayPalHttp-Dotnet", "PayPalHttp-Dotnet\PayPalHttp-Dotnet.csproj", "{84E2B926-5A3B-4F95-9B63-291E0240C1B4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {721A137C-849F-4F38-8469-313FBDACA8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {721A137C-849F-4F38-8469-313FBDACA8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Debug|x64.Build.0 = Debug|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Debug|x86.Build.0 = Debug|Any CPU {721A137C-849F-4F38-8469-313FBDACA8A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {721A137C-849F-4F38-8469-313FBDACA8A1}.Release|Any CPU.Build.0 = Release|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Release|x64.ActiveCfg = Release|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Release|x64.Build.0 = Release|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Release|x86.ActiveCfg = Release|Any CPU + {721A137C-849F-4F38-8469-313FBDACA8A1}.Release|x86.Build.0 = Release|Any CPU {84E2B926-5A3B-4F95-9B63-291E0240C1B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {84E2B926-5A3B-4F95-9B63-291E0240C1B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {84E2B926-5A3B-4F95-9B63-291E0240C1B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -32,4 +41,10 @@ Global {84E2B926-5A3B-4F95-9B63-291E0240C1B4}.Release|x86.ActiveCfg = Release|x86 {84E2B926-5A3B-4F95-9B63-291E0240C1B4}.Release|x86.Build.0 = Release|x86 EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A522D1EE-4E5C-4029-836F-2B7DF2026BE7} + EndGlobalSection EndGlobal diff --git a/PayPalHttp-Dotnet/Encoder.cs b/PayPalHttp-Dotnet/Encoder.cs index da6fbb8..b180a1a 100644 --- a/PayPalHttp-Dotnet/Encoder.cs +++ b/PayPalHttp-Dotnet/Encoder.cs @@ -13,25 +13,36 @@ namespace PayPalHttp { public class Encoder { - private List serializers; + private static readonly Dictionary DefaultSerializers = new Dictionary(); + + private readonly Dictionary _serializerLookup; + + static Encoder() + { + RegisterSerializer(new JsonSerializer(), DefaultSerializers); + RegisterSerializer(new TextSerializer(), DefaultSerializers); + RegisterSerializer(new MultipartSerializer(), DefaultSerializers); + RegisterSerializer(new FormEncodedSerializer(), DefaultSerializers); + } public Encoder() { - serializers = new List(); - RegisterSerializer(new JsonSerializer()); - RegisterSerializer(new TextSerializer()); - RegisterSerializer(new MultipartSerializer()); - RegisterSerializer(new FormEncodedSerializer()); + _serializerLookup = new Dictionary(DefaultSerializers); } - public void RegisterSerializer(ISerializer serializer) + private static void RegisterSerializer(ISerializer serializer, Dictionary serializerLookup) { if (serializer != null) { - serializers.Add(serializer); + serializerLookup[serializer.GetContentTypeRegexPattern()] = serializer; } } + public void RegisterSerializer(ISerializer serializer) + { + RegisterSerializer(serializer, _serializerLookup); + } + public HttpContent SerializeRequest(HttpRequest request) { if (request.ContentType == null) @@ -85,27 +96,12 @@ public object DeserializeResponse(HttpContent content, Type responseType) private ISerializer GetSerializer(string contentType) { - foreach (var serializer in serializers) - { - Regex pattern = new Regex(serializer.GetContentTypeRegexPattern()); - if (pattern.Match(contentType).Success) - { - return serializer; - } - } - - return null; + return _serializerLookup.Values.FirstOrDefault(f => f.GetContentRegEx().Match(contentType).Success); } private string GetSupportedContentTypes() { - List contentTypes = new List(); - foreach (var serializer in this.serializers) - { - contentTypes.Add(serializer.GetContentTypeRegexPattern()); - } - - return String.Join(", ", contentTypes); + return String.Join(", ", _serializerLookup.Keys); } private static byte[] Gzip(string source) diff --git a/PayPalHttp-Dotnet/FormEncodedSerializer.cs b/PayPalHttp-Dotnet/FormEncodedSerializer.cs index 1ab26e9..a38955f 100644 --- a/PayPalHttp-Dotnet/FormEncodedSerializer.cs +++ b/PayPalHttp-Dotnet/FormEncodedSerializer.cs @@ -3,19 +3,18 @@ using System.Collections.Generic; using System.IO; using System.Net.Http; +using System.Text.RegularExpressions; namespace PayPalHttp { public class FormEncodedSerializer: ISerializer { - public string GetContentTypeRegexPattern() - { - return "application/x-www-form-urlencoded"; - } + private const string RegExPattern = "application/x-www-form-urlencoded"; + private static readonly Regex _pattern = new Regex(RegExPattern, RegexOptions.Compiled); public object Decode(HttpContent content, Type responseType) { - throw new IOException($"Unable to deserialize Content-Type: {this.GetContentTypeRegexPattern()}."); + throw new IOException($"Unable to deserialize Content-Type: {RegExPattern}."); } public HttpContent Encode(HttpRequest request) @@ -27,5 +26,15 @@ public HttpContent Encode(HttpRequest request) return new FormUrlEncodedContent((Dictionary)request.Body); } + + public Regex GetContentRegEx() + { + return _pattern; + } + + public string GetContentTypeRegexPattern() + { + return RegExPattern; + } } } diff --git a/PayPalHttp-Dotnet/ISerializer.cs b/PayPalHttp-Dotnet/ISerializer.cs index 4912445..f104e4d 100644 --- a/PayPalHttp-Dotnet/ISerializer.cs +++ b/PayPalHttp-Dotnet/ISerializer.cs @@ -1,11 +1,14 @@ using System; using System.Net.Http; using System.Net.Http.Headers; +using System.Text.RegularExpressions; + namespace PayPalHttp { public interface ISerializer { string GetContentTypeRegexPattern(); + Regex GetContentRegEx(); HttpContent Encode(HttpRequest request); object Decode(HttpContent content, Type responseType); } diff --git a/PayPalHttp-Dotnet/JsonSerializer.cs b/PayPalHttp-Dotnet/JsonSerializer.cs index 52e5cd9..5c90ef1 100644 --- a/PayPalHttp-Dotnet/JsonSerializer.cs +++ b/PayPalHttp-Dotnet/JsonSerializer.cs @@ -2,15 +2,14 @@ using System.Net.Http; using System.Runtime.Serialization.Json; using System.IO; +using System.Text.RegularExpressions; namespace PayPalHttp { public class JsonSerializer : ISerializer { - public string GetContentTypeRegexPattern() - { - return "application/json"; - } + private const string RegExPattern = "application/json"; + private static readonly Regex _pattern = new Regex(RegExPattern, RegexOptions.Compiled); public object Decode(HttpContent content, Type responseType) { @@ -33,9 +32,19 @@ public HttpContent Encode(HttpRequest request) ms.Position = 0; using (var sr = new StreamReader(ms)) { - return new StringContent(sr.ReadToEnd(), System.Text.Encoding.UTF8, "application/json"); + return new StringContent(sr.ReadToEnd(), System.Text.Encoding.UTF8, RegExPattern); } } } + + public Regex GetContentRegEx() + { + return _pattern; + } + + public string GetContentTypeRegexPattern() + { + return RegExPattern; + } } } diff --git a/PayPalHttp-Dotnet/MultipartSerializer.cs b/PayPalHttp-Dotnet/MultipartSerializer.cs index 7bd28b6..a908295 100644 --- a/PayPalHttp-Dotnet/MultipartSerializer.cs +++ b/PayPalHttp-Dotnet/MultipartSerializer.cs @@ -5,19 +5,18 @@ using System.IO; using System.Collections; using System.Collections.Generic; +using System.Text.RegularExpressions; namespace PayPalHttp { public class MultipartSerializer : ISerializer { - public string GetContentTypeRegexPattern() - { - return "^multipart/.*$"; - } + private const string RegExPattern = "^multipart/.*$"; + private static readonly Regex _pattern = new Regex(RegExPattern, RegexOptions.Compiled); public object Decode(HttpContent content, Type responseType) { - throw new IOException("Unable to deserialize Content-Type: multipart/form-data."); + throw new IOException($"Unable to deserialize Content-Type: multipart/form-data."); } private string GetMimeMapping(string filename) @@ -85,5 +84,15 @@ public HttpContent Encode(HttpRequest request) form.Headers.TryAddWithoutValidation("Content-Type", "multipart/form-data; boundary=" + boundary); return form; } + + public Regex GetContentRegEx() + { + return _pattern; + } + + public string GetContentTypeRegexPattern() + { + return RegExPattern; + } } } diff --git a/PayPalHttp-Dotnet/PayPalHttp-Dotnet.csproj b/PayPalHttp-Dotnet/PayPalHttp-Dotnet.csproj index e2e7d28..c6e1022 100644 --- a/PayPalHttp-Dotnet/PayPalHttp-Dotnet.csproj +++ b/PayPalHttp-Dotnet/PayPalHttp-Dotnet.csproj @@ -2,9 +2,10 @@ netstandard2.0 - PayPalHttp - 1.0.1 - Copyright PayPal, Inc. 2019 + 10.0 + ElCamino.PayPalHttp + 1.7.0 + Copyright PayPal, Inc. 2019 / David Melendez 2022 PayPalHttp is a generic http client designed to be used with code-generated projects. PayPal First Release diff --git a/PayPalHttp-Dotnet/TextSerializer.cs b/PayPalHttp-Dotnet/TextSerializer.cs index 48932f3..44ef0fe 100644 --- a/PayPalHttp-Dotnet/TextSerializer.cs +++ b/PayPalHttp-Dotnet/TextSerializer.cs @@ -1,24 +1,32 @@ using System; using System.Net.Http; +using System.Text.RegularExpressions; namespace PayPalHttp { public class TextSerializer : ISerializer { + private const string RegExPattern = "^text/.*$"; + private static readonly Regex _pattern = new Regex(RegExPattern, RegexOptions.Compiled); public object Decode(HttpContent content, Type responseType) { return content.ReadAsStringAsync().Result; } - public string GetContentTypeRegexPattern() + public HttpContent Encode(HttpRequest request) { - return "^text/.*$"; + return new StringContent(request.Body.ToString()); } - public HttpContent Encode(HttpRequest request) + public Regex GetContentRegEx() { - return new StringContent(request.Body.ToString()); + return _pattern; + } + + public string GetContentTypeRegexPattern() + { + return RegExPattern; } } }