From 3aeecfaaf617b9a3dd0888d6aba5bcbeac89807c Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Fri, 8 Jul 2022 10:05:22 +0200 Subject: [PATCH] Rename (WireMock.Pact.Models.V2)-Request to PactRequest and -Response to PactResponse --- src/WireMock.Net/Pact/Models/V2/Interaction.cs | 15 +++++++-------- .../Pact/Models/V2/{Request.cs => PactRequest.cs} | 2 +- .../Models/V2/{Response.cs => PactResponse.cs} | 2 +- src/WireMock.Net/Serialization/PactMapper.cs | 10 +++++----- 4 files changed, 14 insertions(+), 15 deletions(-) rename src/WireMock.Net/Pact/Models/V2/{Request.cs => PactRequest.cs} (92%) rename src/WireMock.Net/Pact/Models/V2/{Response.cs => PactResponse.cs} (89%) diff --git a/src/WireMock.Net/Pact/Models/V2/Interaction.cs b/src/WireMock.Net/Pact/Models/V2/Interaction.cs index 66feeaa79..9dff35e1d 100644 --- a/src/WireMock.Net/Pact/Models/V2/Interaction.cs +++ b/src/WireMock.Net/Pact/Models/V2/Interaction.cs @@ -1,13 +1,12 @@ -namespace WireMock.Pact.Models.V2 +namespace WireMock.Pact.Models.V2; + +public class Interaction { - public class Interaction - { - public string Description { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; - public string ProviderState { get; set; } + public string ProviderState { get; set; } - public Request Request { get; set; } = new Request(); + public PactRequest Request { get; set; } = new PactRequest(); - public Response Response { get; set; } = new Response(); - } + public PactResponse Response { get; set; } = new PactResponse(); } \ No newline at end of file diff --git a/src/WireMock.Net/Pact/Models/V2/Request.cs b/src/WireMock.Net/Pact/Models/V2/PactRequest.cs similarity index 92% rename from src/WireMock.Net/Pact/Models/V2/Request.cs rename to src/WireMock.Net/Pact/Models/V2/PactRequest.cs index 9d5f5f2bb..b4329b832 100644 --- a/src/WireMock.Net/Pact/Models/V2/Request.cs +++ b/src/WireMock.Net/Pact/Models/V2/PactRequest.cs @@ -2,7 +2,7 @@ namespace WireMock.Pact.Models.V2; -public class Request +public class PactRequest { public IDictionary? Headers { get; set; } diff --git a/src/WireMock.Net/Pact/Models/V2/Response.cs b/src/WireMock.Net/Pact/Models/V2/PactResponse.cs similarity index 89% rename from src/WireMock.Net/Pact/Models/V2/Response.cs rename to src/WireMock.Net/Pact/Models/V2/PactResponse.cs index 6abf9a5f9..d2bdc8122 100644 --- a/src/WireMock.Net/Pact/Models/V2/Response.cs +++ b/src/WireMock.Net/Pact/Models/V2/PactResponse.cs @@ -2,7 +2,7 @@ namespace WireMock.Pact.Models.V2; -public class Response +public class PactResponse { public object? Body { get; set; } diff --git a/src/WireMock.Net/Serialization/PactMapper.cs b/src/WireMock.Net/Serialization/PactMapper.cs index 44e2cf7eb..0a10ee1a9 100644 --- a/src/WireMock.Net/Serialization/PactMapper.cs +++ b/src/WireMock.Net/Serialization/PactMapper.cs @@ -53,9 +53,9 @@ public static (string FileName, byte[] Bytes) ToPact(WireMockServer server, stri return (filename, JsonUtils.SerializeAsPactFile(pact)); } - private static Request MapRequest(RequestModel request, string path) + private static PactRequest MapRequest(RequestModel request, string path) { - return new Request + return new PactRequest { Method = request.Methods?.FirstOrDefault() ?? DefaultMethod, Path = path, @@ -65,14 +65,14 @@ private static Request MapRequest(RequestModel request, string path) }; } - private static Response MapResponse(ResponseModel? response) + private static PactResponse MapResponse(ResponseModel? response) { if (response == null) { - return new Response(); + return new PactResponse(); } - return new Response + return new PactResponse { Status = MapStatusCode(response.StatusCode), Headers = MapResponseHeaders(response.Headers),