Skip to content

Make more of the API internal #50

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 7 commits into from
Aug 26, 2024
Merged

Make more of the API internal #50

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4127cd2
Make more of the API internal
lukebakken Aug 26, 2024
1ef1fed
* Make `ExchangeSpec` internal
lukebakken Aug 26, 2024
da75ef3
* Make `BindingSpec` internal
lukebakken Aug 26, 2024
74cf2c0
* Make `ITopologyListener` internal
lukebakken Aug 26, 2024
0707923
* Remove some logging
lukebakken Aug 26, 2024
b18e10d
* Remove net7.0 as it is out of support
lukebakken Aug 26, 2024
ae9a05f
* Remove the last usages of `ManualResetEvent` from the test suite
lukebakken Aug 26, 2024
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 RabbitMQ.AMQP.Client/Impl/AmqpManagement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public IExchangeSpecification Exchange(string name)
return Exchange().Name(name);
}

public IExchangeSpecification Exchange(ExchangeSpec spec)
internal IExchangeSpecification Exchange(ExchangeSpec spec)
{
return Exchange().Name(spec.Name)
.AutoDelete(spec.AutoDelete)
Expand All @@ -107,7 +107,7 @@ public IBindingSpecification Binding()
return new AmqpBindingSpecification(this);
}

public IBindingSpecification Binding(BindingSpec spec)
internal IBindingSpecification Binding(BindingSpec spec)
{
return Binding()
.SourceExchange(spec.SourceExchange)
Expand Down
40 changes: 19 additions & 21 deletions RabbitMQ.AMQP.Client/Impl/RecordingTopologyListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

namespace RabbitMQ.AMQP.Client.Impl;

public interface IVisitor
internal interface IVisitor
{
Task VisitQueuesAsync(IEnumerable<QueueSpec> queueSpec);
Task VisitExchangesAsync(IEnumerable<ExchangeSpec> exchangeSpec);

Task VisitBindingsAsync(IEnumerable<BindingSpec> bindingSpec);
}

Expand Down Expand Up @@ -99,7 +98,7 @@ public int ExchangeCount()
public int BindingCount() => _bindingSpecifications.Count;


public async Task Accept(IVisitor visitor)
internal async Task Accept(IVisitor visitor)
{
await visitor.VisitQueuesAsync(_queueSpecifications.Values).ConfigureAwait(false);

Expand All @@ -109,40 +108,39 @@ public async Task Accept(IVisitor visitor)
}
}

// TODO this could probably be made internal
public class QueueSpec(IQueueSpecification specification)
internal class QueueSpec(IQueueSpecification specification)
{
public string Name { get; init; } = specification.Name();
internal string Name { get; init; } = specification.Name();

public bool Exclusive { get; init; } = specification.Exclusive();
internal bool Exclusive { get; init; } = specification.Exclusive();

public bool AutoDelete { get; init; } = specification.AutoDelete();
internal bool AutoDelete { get; init; } = specification.AutoDelete();

public Dictionary<object, object> Arguments { get; init; } = specification.Arguments();
internal Dictionary<object, object> Arguments { get; init; } = specification.Arguments();
}

public class ExchangeSpec(IExchangeSpecification specification)
internal class ExchangeSpec(IExchangeSpecification specification)
{
public string Name { get; } = specification.Name();
internal string Name { get; } = specification.Name();

public ExchangeType Type { get; } = specification.Type();
internal ExchangeType Type { get; } = specification.Type();

public bool AutoDelete { get; } = specification.AutoDelete();
internal bool AutoDelete { get; } = specification.AutoDelete();

public Dictionary<string, object> Arguments { get; } = specification.Arguments();
internal Dictionary<string, object> Arguments { get; } = specification.Arguments();
}

public class BindingSpec(IBindingSpecification specification)
internal class BindingSpec(IBindingSpecification specification)
{
public string SourceExchange { get; } = specification.SourceExchangeName();
internal string SourceExchange { get; } = specification.SourceExchangeName();

public string DestinationQueue { get; } = specification.DestinationQueueName();
internal string DestinationQueue { get; } = specification.DestinationQueueName();

public string DestinationExchange { get; } = specification.DestinationExchangeName();
internal string DestinationExchange { get; } = specification.DestinationExchangeName();

public string Key { get; } = specification.Key();
internal string Key { get; } = specification.Key();

public Dictionary<string, object> Arguments { get; } = specification.Arguments();
internal Dictionary<string, object> Arguments { get; } = specification.Arguments();

public string Path { get; } = specification.Path();
internal string Path { get; } = specification.Path();
}
31 changes: 0 additions & 31 deletions RabbitMQ.AMQP.Client/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,7 @@ RabbitMQ.AMQP.Client.Impl.AmqpExchangeSpecification.Type() -> RabbitMQ.AMQP.Clie
RabbitMQ.AMQP.Client.Impl.AmqpExchangeSpecification.Type(RabbitMQ.AMQP.Client.ExchangeType type) -> RabbitMQ.AMQP.Client.IExchangeSpecification!
RabbitMQ.AMQP.Client.Impl.AmqpManagement
RabbitMQ.AMQP.Client.Impl.AmqpManagement.Binding() -> RabbitMQ.AMQP.Client.IBindingSpecification!
RabbitMQ.AMQP.Client.Impl.AmqpManagement.Binding(RabbitMQ.AMQP.Client.Impl.BindingSpec! spec) -> RabbitMQ.AMQP.Client.IBindingSpecification!
RabbitMQ.AMQP.Client.Impl.AmqpManagement.Exchange() -> RabbitMQ.AMQP.Client.IExchangeSpecification!
RabbitMQ.AMQP.Client.Impl.AmqpManagement.Exchange(RabbitMQ.AMQP.Client.Impl.ExchangeSpec! spec) -> RabbitMQ.AMQP.Client.IExchangeSpecification!
RabbitMQ.AMQP.Client.Impl.AmqpManagement.Exchange(string! name) -> RabbitMQ.AMQP.Client.IExchangeSpecification!
RabbitMQ.AMQP.Client.Impl.AmqpManagement.GetQueueInfoAsync(RabbitMQ.AMQP.Client.IQueueSpecification! queueSpec, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IQueueInfo!>!
RabbitMQ.AMQP.Client.Impl.AmqpManagement.GetQueueInfoAsync(string! queueName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IQueueInfo!>!
Expand Down Expand Up @@ -339,14 +337,6 @@ RabbitMQ.AMQP.Client.Impl.BackOffDelayPolicy.CurrentAttempt.get -> int
RabbitMQ.AMQP.Client.Impl.BackOffDelayPolicy.Delay() -> int
RabbitMQ.AMQP.Client.Impl.BackOffDelayPolicy.IsActive() -> bool
RabbitMQ.AMQP.Client.Impl.BackOffDelayPolicy.Reset() -> void
RabbitMQ.AMQP.Client.Impl.BindingSpec
RabbitMQ.AMQP.Client.Impl.BindingSpec.Arguments.get -> System.Collections.Generic.Dictionary<string!, object!>!
RabbitMQ.AMQP.Client.Impl.BindingSpec.BindingSpec(RabbitMQ.AMQP.Client.IBindingSpecification! specification) -> void
RabbitMQ.AMQP.Client.Impl.BindingSpec.DestinationExchange.get -> string!
RabbitMQ.AMQP.Client.Impl.BindingSpec.DestinationQueue.get -> string!
RabbitMQ.AMQP.Client.Impl.BindingSpec.Key.get -> string!
RabbitMQ.AMQP.Client.Impl.BindingSpec.Path.get -> string!
RabbitMQ.AMQP.Client.Impl.BindingSpec.SourceExchange.get -> string!
RabbitMQ.AMQP.Client.Impl.BindingSpecificationBase
RabbitMQ.AMQP.Client.Impl.BindingSpecificationBase.ArgsToMap() -> Amqp.Types.Map!
RabbitMQ.AMQP.Client.Impl.BindingSpecificationBase.BindingSpecificationBase() -> void
Expand Down Expand Up @@ -412,32 +402,11 @@ RabbitMQ.AMQP.Client.Impl.DeliveryContext.AcceptAsync() -> System.Threading.Task
RabbitMQ.AMQP.Client.Impl.DeliveryContext.DeliveryContext(Amqp.IReceiverLink! link, Amqp.Message! message, RabbitMQ.AMQP.Client.Impl.UnsettledMessageCounter! unsettledMessageCounter) -> void
RabbitMQ.AMQP.Client.Impl.DeliveryContext.DiscardAsync() -> System.Threading.Tasks.Task!
RabbitMQ.AMQP.Client.Impl.DeliveryContext.RequeueAsync() -> System.Threading.Tasks.Task!
RabbitMQ.AMQP.Client.Impl.ExchangeSpec
RabbitMQ.AMQP.Client.Impl.ExchangeSpec.Arguments.get -> System.Collections.Generic.Dictionary<string!, object!>!
RabbitMQ.AMQP.Client.Impl.ExchangeSpec.AutoDelete.get -> bool
RabbitMQ.AMQP.Client.Impl.ExchangeSpec.ExchangeSpec(RabbitMQ.AMQP.Client.IExchangeSpecification! specification) -> void
RabbitMQ.AMQP.Client.Impl.ExchangeSpec.Name.get -> string!
RabbitMQ.AMQP.Client.Impl.ExchangeSpec.Type.get -> RabbitMQ.AMQP.Client.ExchangeType
RabbitMQ.AMQP.Client.Impl.FieldNotSetException
RabbitMQ.AMQP.Client.Impl.FieldNotSetException.FieldNotSetException() -> void
RabbitMQ.AMQP.Client.Impl.InvalidCodeException
RabbitMQ.AMQP.Client.Impl.InvalidCodeException.InvalidCodeException(string! message) -> void
RabbitMQ.AMQP.Client.Impl.IVisitor
RabbitMQ.AMQP.Client.Impl.IVisitor.VisitBindingsAsync(System.Collections.Generic.IEnumerable<RabbitMQ.AMQP.Client.Impl.BindingSpec!>! bindingSpec) -> System.Threading.Tasks.Task!
RabbitMQ.AMQP.Client.Impl.IVisitor.VisitExchangesAsync(System.Collections.Generic.IEnumerable<RabbitMQ.AMQP.Client.Impl.ExchangeSpec!>! exchangeSpec) -> System.Threading.Tasks.Task!
RabbitMQ.AMQP.Client.Impl.IVisitor.VisitQueuesAsync(System.Collections.Generic.IEnumerable<RabbitMQ.AMQP.Client.Impl.QueueSpec!>! queueSpec) -> System.Threading.Tasks.Task!
RabbitMQ.AMQP.Client.Impl.QueueSpec
RabbitMQ.AMQP.Client.Impl.QueueSpec.Arguments.get -> System.Collections.Generic.Dictionary<object!, object!>!
RabbitMQ.AMQP.Client.Impl.QueueSpec.Arguments.init -> void
RabbitMQ.AMQP.Client.Impl.QueueSpec.AutoDelete.get -> bool
RabbitMQ.AMQP.Client.Impl.QueueSpec.AutoDelete.init -> void
RabbitMQ.AMQP.Client.Impl.QueueSpec.Exclusive.get -> bool
RabbitMQ.AMQP.Client.Impl.QueueSpec.Exclusive.init -> void
RabbitMQ.AMQP.Client.Impl.QueueSpec.Name.get -> string!
RabbitMQ.AMQP.Client.Impl.QueueSpec.Name.init -> void
RabbitMQ.AMQP.Client.Impl.QueueSpec.QueueSpec(RabbitMQ.AMQP.Client.IQueueSpecification! specification) -> void
RabbitMQ.AMQP.Client.Impl.RecordingTopologyListener
RabbitMQ.AMQP.Client.Impl.RecordingTopologyListener.Accept(RabbitMQ.AMQP.Client.Impl.IVisitor! visitor) -> System.Threading.Tasks.Task!
RabbitMQ.AMQP.Client.Impl.RecordingTopologyListener.BindingCount() -> int
RabbitMQ.AMQP.Client.Impl.RecordingTopologyListener.BindingDeclared(RabbitMQ.AMQP.Client.IBindingSpecification! specification) -> void
RabbitMQ.AMQP.Client.Impl.RecordingTopologyListener.BindingDeleted(string! key) -> void
Expand Down