From 53d81e75d85e86b7b70015101ad75248866cf7b4 Mon Sep 17 00:00:00 2001 From: Chris Rudolphi <1702962+clrudolphi@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:42:47 -0500 Subject: [PATCH 1/4] Schema: Move comment within TestStep A description of the TestStep's StepDefinitionIds was mistakenly placed as comment on the StepMatchArgumentsList. This commit fixes that by moving the comment up to the StepDefinitionIds field. --- dotnet/Cucumber.Messages/generated/TestStep.cs | 4 ++-- jsonschema/TestCase.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dotnet/Cucumber.Messages/generated/TestStep.cs b/dotnet/Cucumber.Messages/generated/TestStep.cs index b77abb9c..a3ba3f0a 100644 --- a/dotnet/Cucumber.Messages/generated/TestStep.cs +++ b/dotnet/Cucumber.Messages/generated/TestStep.cs @@ -30,12 +30,12 @@ public sealed class TestStep public string PickleStepId { get; private set; } /** * Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`) + * Each element represents a matching step definition. A size of 0 means `UNDEFINED`, + * and a size of 2+ means `AMBIGUOUS` */ public List StepDefinitionIds { get; private set; } /** * A list of list of StepMatchArgument (if derived from a `PickleStep`). - * Each element represents a matching step definition. A size of 0 means `UNDEFINED`, - * and a size of 2+ means `AMBIGUOUS` */ public List StepMatchArgumentsLists { get; private set; } diff --git a/jsonschema/TestCase.json b/jsonschema/TestCase.json index 230127f5..ed4e8f9b 100644 --- a/jsonschema/TestCase.json +++ b/jsonschema/TestCase.json @@ -80,14 +80,14 @@ "type": "string" }, "stepDefinitionIds": { - "description": "Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`)", + "description": "Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`)\n Each element represents a matching step definition. A size of 0 means `UNDEFINED`,\n and a size of 2+ means `AMBIGUOUS`", "items": { "type": "string" }, "type": "array" }, "stepMatchArgumentsLists": { - "description": "A list of list of StepMatchArgument (if derived from a `PickleStep`).\n Each element represents a matching step definition. A size of 0 means `UNDEFINED`,\n and a size of 2+ means `AMBIGUOUS`", + "description": "A list of list of StepMatchArgument (if derived from a `PickleStep`).", "items": { "$ref": "#/definitions/StepMatchArgumentsList" }, From 8f367044c41ee7cc0744627071c8b44d38a33afa Mon Sep 17 00:00:00 2001 From: Chris Rudolphi <1702962+clrudolphi@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:48:10 -0500 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ab414a..5bc767cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [Dotnet] Fixed code generation for types that accept List as parameters. Constructors were not properly handling null input. ([#249](https://github.com/cucumber/messages/pull/249) [clrudolphi]) ### Changed - [Go] Switch to Google's UUID module ([#251](https://github.com/cucumber/messages/pull/251)) +- Schema: moved contents of the description of the StepDefinitionIds field from the StepMatchArgumentsList`field where it had been mistakenly placed.[clrudolphi]` ## [26.0.0] - 2024-08-15 ### Added From 864407ed78460ff28d241619efa50bb6a057351d Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Fri, 20 Sep 2024 12:24:49 +0200 Subject: [PATCH 3/4] Run code gen --- .../generated/java/io/cucumber/messages/types/TestStep.java | 4 ++-- perl/lib/Cucumber/Messages.pm | 4 ++-- php/src-generated/TestStep.php | 4 ++-- ruby/lib/cucumber/messages/test_step.rb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/src/generated/java/io/cucumber/messages/types/TestStep.java b/java/src/generated/java/io/cucumber/messages/types/TestStep.java index dce18a7d..47284cd6 100644 --- a/java/src/generated/java/io/cucumber/messages/types/TestStep.java +++ b/java/src/generated/java/io/cucumber/messages/types/TestStep.java @@ -57,6 +57,8 @@ public Optional getPickleStepId() { /** * Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`) + * Each element represents a matching step definition. A size of 0 means `UNDEFINED`, + * and a size of 2+ means `AMBIGUOUS` */ public Optional> getStepDefinitionIds() { return Optional.ofNullable(stepDefinitionIds); @@ -64,8 +66,6 @@ public Optional> getStepDefinitionIds() { /** * A list of list of StepMatchArgument (if derived from a `PickleStep`). - * Each element represents a matching step definition. A size of 0 means `UNDEFINED`, - * and a size of 2+ means `AMBIGUOUS` */ public Optional> getStepMatchArgumentsLists() { return Optional.ofNullable(stepMatchArgumentsLists); diff --git a/perl/lib/Cucumber/Messages.pm b/perl/lib/Cucumber/Messages.pm index d47992a3..7ed80582 100644 --- a/perl/lib/Cucumber/Messages.pm +++ b/perl/lib/Cucumber/Messages.pm @@ -3968,6 +3968,8 @@ has pickle_step_id => =head4 step_definition_ids Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`) + Each element represents a matching step definition. A size of 0 means `UNDEFINED`, + and a size of 2+ means `AMBIGUOUS` =cut has step_definition_ids => @@ -3978,8 +3980,6 @@ has step_definition_ids => =head4 step_match_arguments_lists A list of list of StepMatchArgument (if derived from a `PickleStep`). - Each element represents a matching step definition. A size of 0 means `UNDEFINED`, - and a size of 2+ means `AMBIGUOUS` =cut has step_match_arguments_lists => diff --git a/php/src-generated/TestStep.php b/php/src-generated/TestStep.php index e989439c..b5623b9d 100644 --- a/php/src-generated/TestStep.php +++ b/php/src-generated/TestStep.php @@ -42,13 +42,13 @@ public function __construct( /** * Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`) + * Each element represents a matching step definition. A size of 0 means `UNDEFINED`, + * and a size of 2+ means `AMBIGUOUS` */ public readonly ?array $stepDefinitionIds = null, /** * A list of list of StepMatchArgument (if derived from a `PickleStep`). - * Each element represents a matching step definition. A size of 0 means `UNDEFINED`, - * and a size of 2+ means `AMBIGUOUS` */ public readonly ?array $stepMatchArgumentsLists = null, ) { diff --git a/ruby/lib/cucumber/messages/test_step.rb b/ruby/lib/cucumber/messages/test_step.rb index 5b709d7d..4da93aa3 100644 --- a/ruby/lib/cucumber/messages/test_step.rb +++ b/ruby/lib/cucumber/messages/test_step.rb @@ -26,13 +26,13 @@ class TestStep < Message ## # Pointer to all the matching `StepDefinition`s (if derived from a `PickleStep`) + # Each element represents a matching step definition. A size of 0 means `UNDEFINED`, + # and a size of 2+ means `AMBIGUOUS` ## attr_reader :step_definition_ids ## # A list of list of StepMatchArgument (if derived from a `PickleStep`). - # Each element represents a matching step definition. A size of 0 means `UNDEFINED`, - # and a size of 2+ means `AMBIGUOUS` ## attr_reader :step_match_arguments_lists From afd7710eb847a5a549f7b26fddb6404cb58d5b07 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Fri, 20 Sep 2024 12:30:15 +0200 Subject: [PATCH 4/4] Fix CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bc767cf..03012e6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] ### Fixed - [Dotnet] Fixed code generation for types that accept List as parameters. Constructors were not properly handling null input. ([#249](https://github.com/cucumber/messages/pull/249) [clrudolphi]) +- Moved contents of the description of the StepDefinitionIds field from the StepMatchArgumentsList field where it had been mistakenly placed. ([#252](https://github.com/cucumber/messages/pull/252) [clrudolphi]) + ### Changed - [Go] Switch to Google's UUID module ([#251](https://github.com/cucumber/messages/pull/251)) -- Schema: moved contents of the description of the StepDefinitionIds field from the StepMatchArgumentsList`field where it had been mistakenly placed.[clrudolphi]` ## [26.0.0] - 2024-08-15 ### Added