-
Notifications
You must be signed in to change notification settings - Fork 80
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.
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
Accept endpoint as Uri #185
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
Source/EasyNetQ.Management.Client/Internals/QueryStringHelpers.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
using System.Text; | ||
|
||
namespace EasyNetQ.Management.Client.Internals; | ||
|
||
internal static class QueryStringHelpers | ||
{ | ||
public static string AddQueryString(string uri, IReadOnlyDictionary<string, string>? queryString) | ||
{ | ||
if (queryString == null || queryString.Count == 0) return uri; | ||
|
||
var queryIndex = uri.IndexOf('?'); | ||
var hasQuery = queryIndex != -1; | ||
var sb = new StringBuilder(); | ||
sb.Append(uri); | ||
foreach (var parameter in queryString) | ||
{ | ||
sb.Append(hasQuery ? '&' : '?'); | ||
sb.Append(Uri.EscapeDataString(parameter.Key)); | ||
sb.Append('='); | ||
sb.Append(Uri.EscapeDataString(parameter.Value)); | ||
hasQuery = true; | ||
} | ||
return sb.ToString(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
Source/EasyNetQ.Management.Client/LegacyEndpointBuilder.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
using System.Text.RegularExpressions; | ||
|
||
namespace EasyNetQ.Management.Client; | ||
|
||
internal static class LegacyEndpointBuilder | ||
{ | ||
private static readonly Regex UrlRegex = new(@"^(http|https):\/\/\[?.+\w\]?$", RegexOptions.Compiled | RegexOptions.Singleline); | ||
|
||
public static Uri Build(string hostUrl, int portNumber, bool ssl) | ||
{ | ||
if (string.IsNullOrEmpty(hostUrl)) throw new ArgumentException("hostUrl is null or empty"); | ||
|
||
if (hostUrl.StartsWith("https://")) ssl = true; | ||
|
||
if (ssl) | ||
{ | ||
if (hostUrl.Contains("http://")) throw new ArgumentException("hostUrl is illegal"); | ||
hostUrl = hostUrl.Contains("https://") ? hostUrl : "https://" + hostUrl; | ||
} | ||
else | ||
{ | ||
if (hostUrl.Contains("https://")) throw new ArgumentException("hostUrl is illegal"); | ||
hostUrl = hostUrl.Contains("http://") ? hostUrl : "http://" + hostUrl; | ||
} | ||
|
||
if (!UrlRegex.IsMatch(hostUrl)) throw new ArgumentException("hostUrl is illegal"); | ||
|
||
return Uri.TryCreate(portNumber != 443 ? $"{hostUrl}:{portNumber}" : hostUrl, UriKind.Absolute, out var uri) | ||
? uri | ||
: throw new ArgumentException("hostUrl is illegal"); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider to switch to
IHttpClientFactory
to get all rich configuration features on caller side. So you do not bother withAction<HttpClientHandler>
when manually buildingHttpClient
. Of course this will be one more dependency.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am fine with that if there is a simple way to wire up IHttpClientFactory in console app without DI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You may use some DI stuff inside like for
CreateBus
in ENQ. Consider something like that:It another ctor accepting
Action<IHttpClientBuilder> configure
instead ofIHttpClientFactory
.