Skip to content

Commit 452e8d7

Browse files
cdavernascdavernas
authored
Merge pull request #331 from neuroglia-io/fix-odata
Updated all package references to latest, thus fixing #328
2 parents 440c394 + 0eaab94 commit 452e8d7

34 files changed

+161
-118
lines changed

‎src/apis/management/Synapse.Apis.Management.Http.Client/Synapse.Apis.Management.Http.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@
3535
<ProjectReference Include="..\Synapse.Apis.Management.Core\Synapse.Apis.Management.Core.csproj" />
3636
</ItemGroup>
3737
<ItemGroup>
38-
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.4.1" />
38+
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.4.4" />
3939
</ItemGroup>
4040
</Project>

‎src/apis/management/Synapse.Apis.Management.Http/Synapse.Apis.Management.Http.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
</ItemGroup>
2727
<ItemGroup>
2828
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
29-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.11" />
30-
<PackageReference Include="Microsoft.AspNetCore.OData.NewtonsoftJson" Version="8.0.4" />
31-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="2.0.9" />
29+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.12" />
30+
<PackageReference Include="Microsoft.AspNetCore.OData.NewtonsoftJson" Version="8.0.12" />
31+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="2.0.12" />
3232
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.4.0" />
3333
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
3434
</ItemGroup>

‎src/apis/monitoring/Synapse.Apis.Monitoring.WebSocket/Synapse.Apis.Monitoring.WebSocket.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<DebugType>embedded</DebugType>
2222
</PropertyGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
2524
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.10" />
2625
</ItemGroup>
2726
<ItemGroup>

‎src/apps/Synapse.Server/Program.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using Neuroglia.Caching;
2020
using Neuroglia.Data.Expressions.JQ;
2121
using Neuroglia.Eventing;
22+
using Neuroglia.Serialization;
2223
using ProtoBuf.Grpc.Server;
2324
using Swashbuckle.AspNetCore.SwaggerUI;
2425
using Synapse;
@@ -27,6 +28,7 @@
2728
using Synapse.Apis.Monitoring.WebSocket;
2829
using Synapse.Apis.Runtime.Grpc;
2930
using Synapse.Application.Configuration;
31+
using Synapse.Domain.Models;
3032
using Synapse.Runtime;
3133

3234
var builder = WebApplication.CreateBuilder(args);
@@ -82,4 +84,5 @@
8284
app.MapFallbackToFile("index.html");
8385
app.MapFallbackToFile("/workflows/{param?}", "index.html");
8486
app.MapFallbackToFile("/workflow-instances/{param?}", "index.html");
87+
8588
await app.RunAsync();

‎src/apps/Synapse.Server/Synapse.Server.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.10" />
3434
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
35-
<PackageReference Include="Neuroglia.Caching.InMemory" Version="2.0.9" />
36-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="2.0.9" />
37-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="2.0.9" />
38-
<PackageReference Include="Neuroglia.Serialization.Json" Version="2.0.9" />
35+
<PackageReference Include="Neuroglia.Caching.InMemory" Version="2.0.12" />
36+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="2.0.12" />
37+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="2.0.12" />
38+
<PackageReference Include="Neuroglia.Serialization.Json" Version="2.0.12" />
3939
<PackageReference Include="protobuf-net.Grpc.AspNetCore" Version="1.0.179" />
4040
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
4141
</ItemGroup>

‎src/apps/Synapse.Worker/Synapse.Worker.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,20 @@
3030
<PackageReference Include="GraphQL.Client" Version="5.1.0" />
3131
<PackageReference Include="GraphQL.Client.Serializer.Newtonsoft" Version="5.1.0" />
3232
<PackageReference Include="IdentityModel" Version="6.0.0" />
33+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.12" />
3334
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.10" />
3435
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
35-
<PackageReference Include="Microsoft.OpenApi" Version="1.4.3" />
36-
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.4.1" />
36+
<PackageReference Include="Microsoft.OpenApi" Version="1.4.4" />
37+
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.4.4" />
3738
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
3839
<PackageReference Include="MimeTypes" Version="2.4.0">
3940
<PrivateAssets>all</PrivateAssets>
4041
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4142
</PackageReference>
4243
<PackageReference Include="Neuroglia.AsyncApi.Client.All" Version="2.1.0.6" />
43-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="2.0.9" />
44-
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="2.0.9" />
45-
<PackageReference Include="Neuroglia.Serialization.NewtonsoftJson" Version="2.0.9" />
44+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="2.0.12" />
45+
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="2.0.12" />
46+
<PackageReference Include="Neuroglia.Serialization.NewtonsoftJson" Version="2.0.12" />
4647
<PackageReference Include="protobuf-net.Grpc" Version="1.0.179" />
4748
<PackageReference Include="protobuf-net.Grpc.ClientFactory" Version="1.0.179" />
4849
<PackageReference Include="Simple.OData.Client" Version="6.0.1" />

‎src/core/Synapse.Application/Synapse.Application.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
</ItemGroup>
2626
<ItemGroup>
2727
<PackageReference Include="CloudNative.CloudEvents.NewtonsoftJson" Version="2.5.1" />
28-
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.11" />
28+
<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.12" />
2929
<PackageReference Include="Microsoft.OData.ModelBuilder" Version="1.0.9" />
30-
<PackageReference Include="Neuroglia.AspNetCore.JsonPatch" Version="2.0.9" />
31-
<PackageReference Include="Neuroglia.Data.DistributedCache" Version="2.0.9" />
32-
<PackageReference Include="Neuroglia.Data.EventSourcing" Version="2.0.9" />
33-
<PackageReference Include="Neuroglia.Mediation.FluentValidation" Version="2.0.9" />
30+
<PackageReference Include="Neuroglia.AspNetCore.JsonPatch" Version="2.0.12" />
31+
<PackageReference Include="Neuroglia.Data.DistributedCache" Version="2.0.12" />
32+
<PackageReference Include="Neuroglia.Data.EventSourcing" Version="2.0.12" />
33+
<PackageReference Include="Neuroglia.Mediation.FluentValidation" Version="2.0.12" />
3434
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
3535
</ItemGroup>
3636
</Project>

‎src/core/Synapse.Domain/Models/v1/V1AuthenticationDefinitionCollection.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,14 @@ public V1AuthenticationDefinitionCollection(string name, string version, string?
6868
/// </summary>
6969
public virtual string? Description { get; protected set; }
7070

71+
[Newtonsoft.Json.JsonProperty(nameof(Authentications))]
72+
[System.Text.Json.Serialization.JsonPropertyName(nameof(Authentications))]
7173
private List<AuthenticationDefinition> _Authentications = new();
7274
/// <summary>
7375
/// Gets an <see cref="IReadOnlyCollection{T}"/> containing the <see cref="AuthenticationDefinition"/>s the <see cref="V1AuthenticationDefinitionCollection"/> is made out of
7476
/// </summary>
77+
[Newtonsoft.Json.JsonIgnore]
78+
[System.Text.Json.Serialization.JsonIgnore]
7579
public virtual IReadOnlyCollection<AuthenticationDefinition> Authentications => this._Authentications.AsReadOnly();
7680

7781
/// <summary>

‎src/core/Synapse.Domain/Models/v1/V1Correlation.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@ protected V1Correlation()
5050
public V1Correlation(V1CorrelationActivationType activationType, V1CorrelationLifetime lifetime, V1CorrelationConditionType conditionType, IEnumerable<V1CorrelationCondition> conditions, V1CorrelationOutcome outcome, V1CorrelationContext? context = null)
5151
: base(Guid.NewGuid().ToString())
5252
{
53-
if(conditions == null
54-
|| !conditions.Any())
55-
throw DomainException.ArgumentNull(nameof(conditions));
56-
if(outcome == null)
57-
throw DomainException.ArgumentNull(nameof(outcome));
53+
if(conditions == null || !conditions.Any()) throw DomainException.ArgumentNull(nameof(conditions));
54+
if(outcome == null) throw DomainException.ArgumentNull(nameof(outcome));
5855
this.On(this.RegisterEvent(new V1CorrelationCreatedDomainEvent(this.Id, activationType, lifetime, conditionType, conditions, outcome, context)));
5956
}
6057

‎src/core/Synapse.Domain/Models/v1/V1CorrelationCondition.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*
1616
*/
1717

18+
using k8s.KubeConfigModels;
19+
1820
namespace Synapse.Domain.Models
1921
{
2022

@@ -45,10 +47,14 @@ public V1CorrelationCondition(params V1EventFilter[] filters)
4547
this._Filters = filters.ToList();
4648
}
4749

50+
[Newtonsoft.Json.JsonProperty(nameof(Filters))]
51+
[System.Text.Json.Serialization.JsonPropertyName(nameof(Filters))]
4852
private List<V1EventFilter> _Filters = new();
4953
/// <summary>
5054
/// Gets an <see cref="IReadOnlyCollection{T}"/> containing the <see cref="V1EventFilter"/> used to configure the filtering of events that can fire the <see cref="V1Correlation"/>
5155
/// </summary>
56+
[Newtonsoft.Json.JsonIgnore]
57+
[System.Text.Json.Serialization.JsonIgnore]
5258
public IReadOnlyCollection<V1EventFilter> Filters => this._Filters.AsReadOnly();
5359

5460
/// <summary>

0 commit comments

Comments
 (0)