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 SW.Bitween.Api/Resources/Subscriptions/SaveMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public Validate(NativeAdapterDiscoveryService nativeAdapterDiscovery, IServicePr

if (mapperId.StartsWith(NativeAdapterDiscoveryService.NativePrefix, StringComparison.OrdinalIgnoreCase))
{
var properties = nativeAdapterDiscovery.GetExpectedStartupValues(mapperId);
mustProps = properties.Where(p => p.Value.EndsWith(" *")).Select(p => p.Key);
var properties = nativeAdapterDiscovery.GetStartupValues(mapperId);
mustProps = properties.Where(p => !p.Value.Optional).Select(p => p.Key);
}
else
{
Expand Down
12 changes: 6 additions & 6 deletions SW.Bitween.Api/Resources/Subscriptions/Update.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public Validate(BitweenDbContext dbContext, IHttpContextAccessor httpContextAcce
// Check if it's a native adapter
if (mapperId.StartsWith(NativeAdapterDiscoveryService.NativePrefix, StringComparison.OrdinalIgnoreCase))
{
var properties = nativeAdapterDiscovery.GetExpectedStartupValues(mapperId);
mustProps = properties.Where(p => p.Value.EndsWith(" *")).Select(p => p.Key);
var properties = nativeAdapterDiscovery.GetStartupValues(mapperId);
mustProps = properties.Where(p => !p.Value.Optional).Select(p => p.Key);
}
else
{
Expand Down Expand Up @@ -174,8 +174,8 @@ public Validate(BitweenDbContext dbContext, IHttpContextAccessor httpContextAcce
// Check if it's a native adapter
if (handlerId.StartsWith(NativeAdapterDiscoveryService.NativePrefix, StringComparison.OrdinalIgnoreCase))
{
var properties = nativeAdapterDiscovery.GetExpectedStartupValues(handlerId);
mustProps = properties.Where(p => p.Value.EndsWith(" *")).Select(p => p.Key);
var properties = nativeAdapterDiscovery.GetStartupValues(handlerId);
mustProps = properties.Where(p => !p.Value.Optional).Select(p => p.Key);
}
else
{
Expand Down Expand Up @@ -219,8 +219,8 @@ public Validate(BitweenDbContext dbContext, IHttpContextAccessor httpContextAcce
// Check if it's a native adapter
if (model.ReceiverId.StartsWith(NativeAdapterDiscoveryService.NativePrefix, StringComparison.OrdinalIgnoreCase))
{
var properties = nativeAdapterDiscovery.GetExpectedStartupValues(model.ReceiverId);
mustProps = properties.Where(p => p.Value.EndsWith(" *")).Select(p => p.Key);
var properties = nativeAdapterDiscovery.GetStartupValues(model.ReceiverId);
mustProps = properties.Where(p => !p.Value.Optional).Select(p => p.Key);
}
else
{
Expand Down