Skip to content

Commit

Permalink
More response refactorings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahzf
ahzf committed Aug 17, 2024
1 parent 097d357 commit 105d2c4
Show file tree
Hide file tree
Showing 107 changed files with 2,266 additions and 1,265 deletions.
3 changes: 1 addition & 2 deletions WWCP_OCPPv2.1/Messages/ARequest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ public abstract class ARequest<TRequest> : ACustomSignableData,
#region Properties

/// <summary>
/// The networking node identification of the message destination.
/// The networking node identification of the final message destination.
/// </summary>
[Obsolete]
public NetworkingNode_Id DestinationId
=> Destination.Last();

Expand Down
31 changes: 22 additions & 9 deletions WWCP_OCPPv2.1/Messages/AResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ public AResponse(TRequest Request,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null,
SerializationFormats? SerializationFormat = null)
SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: this(Request,
Result,
Expand All @@ -91,7 +92,8 @@ public AResponse(TRequest Request,
Signatures,

CustomData,
SerializationFormat)
SerializationFormat,
CancellationToken)

{ }

Expand Down Expand Up @@ -123,7 +125,8 @@ public AResponse(TRequest Request,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null,
SerializationFormats? SerializationFormat = null)
SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Result,
ResponseTimestamp,
Expand All @@ -137,7 +140,8 @@ public AResponse(TRequest Request,
Signatures,

CustomData,
SerializationFormat)
SerializationFormat,
CancellationToken)

{

Expand Down Expand Up @@ -251,14 +255,14 @@ public abstract class AResponse<TResponse> : ACustomSignableData,
/// </summary>
[Mandatory]
public NetworkingNode_Id DestinationId
=> SourceRouting.Last();
=> Destination.Last();

/// <summary>
/// The alternative source routing path through the overlay network
/// towards the message destination.
/// </summary>
[Mandatory]
public SourceRouting SourceRouting { get; }
public SourceRouting Destination { get; }

/// <summary>
/// The networking path of the message through the overlay network.
Expand All @@ -277,6 +281,12 @@ public NetworkingNode_Id DestinationId
[Mandatory]
public TimeSpan Runtime { get; }

/// <summary>
/// The Cancellation Token.
/// </summary>
[Mandatory]
public CancellationToken CancellationToken { get; }

#endregion

#region Constructor(s)
Expand Down Expand Up @@ -308,7 +318,8 @@ public AResponse(Result Result,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null,
SerializationFormats? SerializationFormat = null)
SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(SignKeys,
SignInfos,
Expand All @@ -322,17 +333,19 @@ public AResponse(Result Result,
this.ResponseTimestamp = ResponseTimestamp;
this.Runtime = Runtime;

this.SourceRouting = Destination;
this.Destination = Destination;
this.NetworkPath = NetworkPath;

this.SerializationFormat = SerializationFormat ?? SerializationFormats.Default;
this.CancellationToken = CancellationToken;

unchecked
{

hashCode = this.Result. GetHashCode() * 11 ^
this.ResponseTimestamp.GetHashCode() * 7 ^
this.Runtime. GetHashCode() * 5 ^
this.SourceRouting. GetHashCode() * 3 ^
this.Destination. GetHashCode() * 3 ^
this.NetworkPath. GetHashCode();

}
Expand Down
26 changes: 16 additions & 10 deletions WWCP_OCPPv2.1/Messages/Certificates/CertificateSignedResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,22 @@ public JSONLDContext Context
/// <param name="CustomData">An optional custom data object to allow to store any kind of customer specific data.</param>
public CertificateSignedResponse(CSMS.CertificateSignedRequest Request,
CertificateSignedStatus Status,
StatusInfo? StatusInfo = null,
StatusInfo? StatusInfo = null,

Result? Result = null,
DateTime? ResponseTimestamp = null,
Result? Result = null,
DateTime? ResponseTimestamp = null,

SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,
SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,

IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,
IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null)
CustomData? CustomData = null,

SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Request,
Result ?? Result.OK(),
Expand All @@ -116,7 +119,10 @@ public CertificateSignedResponse(CSMS.CertificateSignedRequest Request,
SignInfos,
Signatures,

CustomData)
CustomData,

SerializationFormat ?? SerializationFormats.JSON,
CancellationToken)

{

Expand Down
28 changes: 17 additions & 11 deletions WWCP_OCPPv2.1/Messages/Certificates/DeleteCertificateResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,32 +91,38 @@ public JSONLDContext Context
/// <param name="CustomData">An optional custom data object to allow to store any kind of customer specific data.</param>
public DeleteCertificateResponse(CSMS.DeleteCertificateRequest Request,
DeleteCertificateStatus Status,
StatusInfo? StatusInfo = null,
StatusInfo? StatusInfo = null,

Result? Result = null,
DateTime? ResponseTimestamp = null,
Result? Result = null,
DateTime? ResponseTimestamp = null,

SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,
SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,

IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,
IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null)
CustomData? CustomData = null,

SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Request,
Result ?? Result.OK(),
ResponseTimestamp,

SourceRouting,
SourceRouting,
NetworkPath,

SignKeys,
SignInfos,
Signatures,

CustomData)
CustomData,

SerializationFormat ?? SerializationFormats.JSON,
CancellationToken)

{

Expand Down
28 changes: 17 additions & 11 deletions WWCP_OCPPv2.1/Messages/Certificates/Get15118EVCertificateResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,23 @@ public JSONLDContext Context
public Get15118EVCertificateResponse(CS.Get15118EVCertificateRequest Request,
ISO15118EVCertificateStatus Status,
EXIData EXIResponse,
UInt32? RemainingContracts = null,
StatusInfo? StatusInfo = null,
UInt32? RemainingContracts = null,
StatusInfo? StatusInfo = null,

Result? Result = null,
DateTime? ResponseTimestamp = null,
Result? Result = null,
DateTime? ResponseTimestamp = null,

SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,
SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,

IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,
IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null)
CustomData? CustomData = null,

SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Request,
Result ?? Result.OK(),
Expand All @@ -133,7 +136,10 @@ public Get15118EVCertificateResponse(CS.Get15118EVCertificateRequest Request,
SignInfos,
Signatures,

CustomData)
CustomData,

SerializationFormat ?? SerializationFormats.JSON,
CancellationToken)

{

Expand Down
28 changes: 17 additions & 11 deletions WWCP_OCPPv2.1/Messages/Certificates/GetCRLResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,32 +99,38 @@ public JSONLDContext Context
public GetCRLResponse(CS.GetCRLRequest Request,
UInt32 GetCRLRequestId,
GenericStatus Status,
StatusInfo? StatusInfo = null,
StatusInfo? StatusInfo = null,

Result? Result = null,
DateTime? ResponseTimestamp = null,
Result? Result = null,
DateTime? ResponseTimestamp = null,

SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,
SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,

IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,
IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null)
CustomData? CustomData = null,

SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Request,
Result ?? Result.OK(),
ResponseTimestamp,

SourceRouting,
SourceRouting,
NetworkPath,

SignKeys,
SignInfos,
Signatures,

CustomData)
CustomData,

SerializationFormat ?? SerializationFormats.JSON,
CancellationToken)

{

Expand Down
28 changes: 17 additions & 11 deletions WWCP_OCPPv2.1/Messages/Certificates/GetCertificateStatusResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,32 +100,38 @@ public JSONLDContext Context
public GetCertificateStatusResponse(CS.GetCertificateStatusRequest Request,
GetCertificateStatus Status,
OCSPResult OCSPResult,
StatusInfo? StatusInfo = null,
StatusInfo? StatusInfo = null,

Result? Result = null,
DateTime? ResponseTimestamp = null,
Result? Result = null,
DateTime? ResponseTimestamp = null,

SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,
SourceRouting? SourceRouting = null,
NetworkPath? NetworkPath = null,

IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,
IEnumerable<KeyPair>? SignKeys = null,
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null)
CustomData? CustomData = null,

SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Request,
Result ?? Result.OK(),
ResponseTimestamp,

SourceRouting,
SourceRouting,
NetworkPath,

SignKeys,
SignInfos,
Signatures,

CustomData)
CustomData,

SerializationFormat ?? SerializationFormats.JSON,
CancellationToken)

{

Expand Down
12 changes: 9 additions & 3 deletions WWCP_OCPPv2.1/Messages/Certificates/GetInstalledCertificateIdsResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,26 @@ public GetInstalledCertificateIdsResponse(CSMS.GetInstalledCertificateIdsRequest
IEnumerable<SignInfo>? SignInfos = null,
IEnumerable<Signature>? Signatures = null,

CustomData? CustomData = null)
CustomData? CustomData = null,

SerializationFormats? SerializationFormat = null,
CancellationToken CancellationToken = default)

: base(Request,
Result ?? Result.OK(),
ResponseTimestamp,

SourceRouting,
SourceRouting,
NetworkPath,

SignKeys,
SignInfos,
Signatures,

CustomData)
CustomData,

SerializationFormat ?? SerializationFormats.JSON,
CancellationToken)

{

Expand Down
Loading

0 comments on commit 105d2c4

Please sign in to comment.