smithy-lang · mtdowling · Jan 19, 2022 · Jan 19, 2022 · rschmitt · Jan 21, 2022
@@ -452,7 +452,7 @@
 * Added `smithy-jmespath`, a dependency-less, JMESPath parser with a rich AST that can be used in code generation, and
   performs static analysis of expressions. ([#621](https://github.com/awslabs/smithy/pull/621))
 * Added `smithy-waiters`, containing the `@waitable` trait. This provides information that clients can use to poll
-  until a desired state is reached, or it is determined that that state cannot be reached. ([#623](https://github.com/awslabs/smithy/pull/623))
+  until a desired state is reached, or it is determined that state cannot be reached. ([#623](https://github.com/awslabs/smithy/pull/623))
 * Added `smithy-aws-cloudformation-traits`, containing several (unstable) traits that indicate CloudFormation resources
   and the additional metadata about their properties. ([#579](https://github.com/awslabs/smithy/pull/579))
 * Added `smithy-aws-cloudformation`, containing the (unstable) "cloudformation" build tool that, given a model

@@ -125,7 +125,7 @@ generating client names in SDKs and for linking between services.
   between two alphanumeric characters.
 * The value MUST NOT contain "AWS", "Aws", or "Amazon".
 * The value SHOULD NOT case-insensitively end with "API", "Client", or "Service".
-* The value MUST NOT change change once a service is publicly released. If the value
+* The value MUST NOT change once a service is publicly released. If the value
   does change, the service will be considered a brand new service in the AWS SDKs
   and Tools.
 
@@ -317,7 +317,7 @@ members:
 Format of an ARN
 ================
 
-An ARN is is a structured URI made up of the following components:
+An ARN is a structured URI made up of the following components:
 
 .. code-block:: none
 

@@ -296,8 +296,8 @@ HTTP binding serialization
 
 The ``aws.protocols#restJson1`` protocol supports all of the HTTP binding traits
 defined in the :ref:`HTTP protocol bindings <http-traits>` specification. The
-serialization formats and and behaviors described for each trait are supported
-as defined in the ``aws.protocols#restJson1`` protocol.
+serialization formats and behaviors described for each trait are supported as
+defined in the ``aws.protocols#restJson1`` protocol.
 
 
 .. |quoted shape name| replace:: ``aws.protocols#restJson1``

@@ -246,8 +246,8 @@ HTTP binding serialization
 
 The ``aws.protocols#restXml`` protocol supports all of the HTTP binding traits
 defined in the :ref:`HTTP protocol bindings <http-traits>` specification. The
-serialization formats and and behaviors described for each trait are supported
-as defined in the ``aws.protocols#restXml`` protocol.
+serialization formats and behaviors described for each trait are supported as
+defined in the ``aws.protocols#restXml`` protocol.
 
 
 .. |quoted shape name| replace:: ``aws.protocols#restXml``

@@ -795,8 +795,8 @@ Trait selector
 Value type
     ``string`` value that defines the prefix to prepend to each header field
     name stored in the targeted map member. For example, given a prefix value
-    of of "X-Amz-Meta-" and a map key entry of "Baz", the resulting header
-    field name serialized in the message is "X-Amz-Meta-Baz".
+    of "X-Amz-Meta-" and a map key entry of "Baz", the resulting header field
+    name serialized in the message is "X-Amz-Meta-Baz".
 Conflicts with
    :ref:`httpLabel-trait`, :ref:`httpQuery-trait`, :ref:`httpQueryParams-trait`,
    :ref:`httpHeader-trait`, :ref:`httpPayload-trait`,
@@ -1239,7 +1239,7 @@ parameters:
 
 1. If serializing the output of an operation, set the status code of the
    response to the ``code`` property of the :ref:`http-trait`.
-2. If serializing an error and the the :ref:`httpError-trait` is present,
+2. If serializing an error and the :ref:`httpError-trait` is present,
    set the status code of the response to its value. Otherwise, set the status
    code to 400 if the error trait is "client" or to 500 if the error trait is
    "server".

@@ -1296,7 +1296,7 @@ Applying traits
 
 Trait values immediately preceding a shape definition are applied to the
 shape. The shape ID of a trait is *resolved* against :token:`smithy:use_statement`\s
-and the current namespace in exactly the same same way as
+and the current namespace in exactly the same way as
 :ref:`other shape IDs <relative-shape-id>`.
 
 The following example applies the :ref:`sensitive-trait` and

@@ -12,7 +12,7 @@ parser.
 * Smithy JSON models can be merged together with other JSON models or other
   Smithy IDL models using the rules defined in :ref:`merging-models`.
 * All shape IDs in the JSON AST MUST be absolute shape IDs that contain a
-  namespace. One of the main drivers of the simplicity of the the JSON AST
+  namespace. One of the main drivers of the simplicity of the JSON AST
   over the Smithy IDL is that relative and forward references never need to
   be resolved.
 

@@ -570,7 +570,7 @@ templates.
     * - literal values
       - Literal values are created when descending into nested properties of
         an ``id``, ``service``, or projection attribute. A literal string is
-        expanded to the the contents of the string with no wrapping quotes.
+        expanded to the contents of the string with no wrapping quotes.
         A literal integer is expanded to the string representation of the
         number. [#comparison]_
     * - :ref:`node <node-attribute>`

@@ -2406,7 +2406,7 @@ target from traits and how their values are defined in
         corresponds to the member name.
     * - union
       - object
-      - The object MUST contain a single single key-value pair. The key MUST be
+      - The object MUST contain a single key-value pair. The key MUST be
         one of the member names of the union shape, and the value MUST be
         compatible with the corresponding shape.
 

@@ -83,7 +83,7 @@ private OpenApi updateModel(Context<? extends Trait> context, OpenApi openapi, C
                 .map(node -> node.expectObjectNode(GATEWAY_RESPONSES_EXTENSION + " must be an object"))
                 .map(node -> updateGatewayResponses(context, corsTrait, node))
                 .orElse(updateGatewayResponses(context, corsTrait));
-        // Add the gateway responses the the `x-amazon-apigateway-gateway-responses` OpenAPI extension.
+        // Add the gateway responses the `x-amazon-apigateway-gateway-responses` OpenAPI extension.
         return openapi.toBuilder()
                 .putExtension(GATEWAY_RESPONSES_EXTENSION, extension)
                 .build();

@@ -38,7 +38,7 @@
  * integration responses will include a statically computed
  * Access-Control-Expose-Headers CORS headers that contains every header
  * exposed by the integration, and Access-Control-Allow-Credentials header
- * if the operation uses a security scheme that needs it, and and
+ * if the operation uses a security scheme that needs it, and
  * Access-Control-Allow-Origin header that is the result of
  * {@link CorsTrait#getOrigin()}.
  */

@@ -108,7 +108,7 @@ apply XmlUnions @httpRequestTests([
     },
     {
         id: "XmlUnionsWithUnionMember",
-        documentation: "Serializes union union member",
+        documentation: "Serializes union member",
         protocol: restXml,
         method: "PUT",
         uri: "/XmlUnions",
@@ -222,7 +222,7 @@ apply XmlUnions @httpResponseTests([
     },
     {
         id: "XmlUnionsWithUnionMember",
-        documentation: "Serializes union union member",
+        documentation: "Serializes union member",
         protocol: restXml,
         code: 200,
         body: """

@@ -37,7 +37,7 @@
  * shapes connected to a service into a single, target namespace. When
  * configuring the transformer, a service and target namespace must be
  * specified. Optionally, tags can be specified for including any additional
- * shapes that should be flattened into the the target namespace. Any shape
+ * shapes that should be flattened into the target namespace. Any shape
  * from outside the service closure that is included via the application of a
  * tag will not be included if it conflicts with a shape in the service closure.
  */

@@ -100,7 +100,7 @@ runtime {
     }
 }
 
-// First, call validate with no args and create a class list to use use application class data sharing.
+// First, call validate with no args and create a class list to use application class data sharing.
 tasks.register("createClassList", Exec) {
     environment("SMITHY_OPTS", "-XX:DumpLoadedClassList=${project.buildDir}/image/smithy-cli-${imageOs}/lib/smithy.lst")
     commandLine("${project.buildDir}/image/smithy-cli-${imageOs}/bin/smithy", "validate")

@@ -425,7 +425,7 @@ public static final class Result {
         public final String classpath;
 
         /**
-         * Smithy build discovery classpath string string.
+         * Smithy build discovery classpath string.
          *
          * <p>This is the classpath that is also specified in the arguments list and
          * is used for model discovery. The value is a colon (:) separate string.

@@ -127,7 +127,7 @@ public String getName() {
      * symbol's declaration in a file with the same name that is
      * returned from this method. Not all languages separate a symbol's
      * definition from its declaration. This method is useful for things
-     * like like C and C++ header files.
+     * like C and C++ header files.
      *
      * <p>This method returns an empty string if no value was provided
      * in the builder.

@@ -55,7 +55,7 @@ public interface UseShapeWriterObserver<T extends CodegenWriter<T, ?>> {
      * <p>This method is invoked before the {@code writerConsumer} of
      * {@link CodegenWriterDelegator#useShapeWriter} is called. This method
      * is invoked within a pushed CodegenWriter state, so any state
-     * modifications made to the CodegenWriter will not persist after the the
+     * modifications made to the CodegenWriter will not persist after the
      * {@code writerConsumer} has completed (e.g., calls to methods like
      * {@link CodeWriter#indent} are not persisted).
      *

@@ -155,7 +155,7 @@ private static String createTraitDiffMessage(Shape oldShape, Shape newShape) {
                 .collect(Collectors.toCollection(TreeSet::new));
 
         if (!removedTraits.isEmpty()) {
-            joiner.add("The targeted shape no longer has the the following traits: " + removedTraits);
+            joiner.add("The targeted shape no longer has the following traits: " + removedTraits);
         }
 
         Set<ShapeId> addedTraits = targetChange.addedTraits()

@@ -147,7 +147,7 @@ public void detectsTraitRemovalOnMemberTarget() {
                    equalTo("The shape targeted by the member `foo.baz#List$member` changed from "
                            + "`foo.baz#String1` (string) to `foo.baz#String2` (string). The `smithy.api#enum` trait "
                            + "was found on the target, so the name of the targeted shape matters for codegen. "
-                           + "The targeted shape no longer has the the following traits: [smithy.api#enum]."));
+                           + "The targeted shape no longer has the following traits: [smithy.api#enum]."));
     }
 
     @Test

@@ -230,7 +230,7 @@ public Set<String> getDisableFeatures() {
     }
 
     /**
-     * Disables OpenAPI features by their property name name (e.g., "allOf").
+     * Disables OpenAPI features by their property name (e.g., "allOf").
      *
      * @param disableFeatures Feature names to disable.
      */

@@ -37,7 +37,7 @@
 /**
  * <p>Validates that operation shape names start with standard verbs.
  *
- * <p>Looks at each operation shape name name and determines if the first
+ * <p>Looks at each operation shape name and determines if the first
  * word in the shape name is one of the pre-defined allowed verbs.
  *
  * <p>If the verb is a key in the map of verbs that have recommended

@@ -51,7 +51,7 @@ private ModelLoader() {}
      *
      * @param traitFactory Factory used to create traits.
      * @param properties Bag of loading properties.
-     * @param filename Filename Filename to assign to the model.
+     * @param filename Filename to assign to the model.
      * @param contentSupplier The supplier that provides an InputStream. The
      *   supplied {@code InputStream} is automatically closed when the loader
      *   has finished reading from it.

@@ -368,7 +368,7 @@ public boolean getBooleanMemberOrDefault(String memberName) {
      * @param name Name of the member to get.
      * @return Returns the node with the given member name.
      * @throws IllegalArgumentException when {@code memberName} is null.
-     * @throws ExpectationNotMetException when {@code memberName} is is not
+     * @throws ExpectationNotMetException when {@code memberName} is not
      *  present in the members map.
      */
     public Node expectMember(String name) {
@@ -382,7 +382,7 @@ public Node expectMember(String name) {
      * @param name Name of the member to get.
      * @param errorMessage The error message to use if the expectation is not met.
      * @return Returns the node with the given member name.
-     * @throws ExpectationNotMetException when {@code memberName} is is not
+     * @throws ExpectationNotMetException when {@code memberName} is not
      *  present in the members map.
      */
     public Node expectMember(String name, String errorMessage) {
@@ -396,7 +396,7 @@ public Node expectMember(String name, String errorMessage) {
      * @param name Name of the member to get.
      * @param errorMessage Error message supplier.
      * @return Returns the node with the given member name.
-     * @throws ExpectationNotMetException when {@code memberName} is is not
+     * @throws ExpectationNotMetException when {@code memberName} is not
      *  present in the members map.
      */
     public Node expectMember(String name, Supplier<String> errorMessage) {

@@ -23,7 +23,7 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 
 /**
- * Indicates that the the data stored in the shape is very large and should
+ * Indicates that the data stored in the shape is very large and should
  * not be stored in memory, or that the size of the data stored in the
  * shape is unknown at the start of a request.
  */

@@ -55,7 +55,7 @@ static TraitFactory createServiceFactory(Iterable<TraitService> services) {
 
     /**
      * Creates a TraitFactory that discovers TraitService providers using
-     * the the Thread context class loader.
+     * the Thread context class loader.
      *
      * @return Returns the created TraitFactory.
      */

@@ -97,7 +97,7 @@ public static Builder builder() {
     }
 
     /**
-     * Changes the Node value the the visitor will evaluate.
+     * Changes the Node value the visitor will evaluate.
      *
      * @param value Value to set.
      */

@@ -70,7 +70,7 @@ public void stopsSendingShapesWhenGetsStopSignal() {
                 .getResult() // ignore built-in errors
                 .get();
 
-        // This is a slightly less efficient variation of of a similar
+        // This is a slightly less efficient variation of a similar
         // test in SelectorTest because it doesn't use a temporary
         // variable to store the recursive neighbors.
         Set<String> ids = SelectorTest.exampleIds(model,

@@ -45,7 +45,7 @@
  * <h2>@smithy.mqtt#publish topics</h2>
  *
  * Operations marked with {@code @smithy.mqtt#publish} resolve to a single topic that
- * is defined by topic topic property of the trait.
+ * is defined by topic property of the trait.
  *
  * <h2>subscribe topics</h2>
  *

@@ -41,7 +41,7 @@
  *
  * <ul>
  *     <li>Operation input is required when a topic has labels.</li>
- *     <li>Topic labels must be be found in the input.</li>
+ *     <li>Topic labels must be found in the input.</li>
  *     <li>The input must not contain extraneous labels.</li>
  * </ul>
  */

@@ -137,7 +137,7 @@ public Schema getSchema(String pointer) {
     }
 
     /**
-     * Gets the the JSON pointer string to a specific shape.
+     * Gets the JSON pointer string to a specific shape.
      *
      * @param shapeId Shape ID to convert into a JSON pointer to a schema component.
      * @return Returns the JSON pointer to this shape as a schema component.

@@ -176,7 +176,7 @@
  *
  * <h2>Opening and closing blocks</h2>
  *
- * <p>{@code CodeWriter} provides a short cut for opening code blocks that that
+ * <p>{@code CodeWriter} provides a short cut for opening code blocks that
  * have an opening an closing delimiter (for example, "{" and "}") and that
  * require indentation inside of the delimiters. Calling {@link #openBlock}
  * and providing the opening statement will write and format a line followed
@@ -264,7 +264,7 @@
  * <p>Trailing spaces can be automatically trimmed from each line by calling
  * {@link #trimTrailingSpaces}.
  *
- * <p>In the the following example:
+ * <p>In the following example:
  *
  * <pre>{@code
  * CodeWriter writer = new CodeWriter();

@@ -231,7 +231,7 @@ public <U> U accept(Visitor<U> visitor) {
     }
 
     /**
-     * Represents an union union value.
+     * Represents an union value.
      */
     public static final class UnknownMember extends Matcher<Node> {
         private final String key;
-Original file line number
+Diff line change
@@ Expand Up / @@ -230,7 +230,7 @@ public Set<String> getDisableFeatures() { @@
         }
         /**
-         * Disables OpenAPI features by their property name name (e.g., "allOf").
+         * Disables OpenAPI features by their property name (e.g., "allOf").
          *
          * @param disableFeatures Feature names to disable.
          */
@@ Expand Down @@