Simplify suffix logic, add docs

Author: Chase Coalwell

docs/source/1.0/guides/converting-to-openapi.rst

@@ -354,6 +354,26 @@ forbidGreedyLabels (``boolean``)
             }
         }
 
+.. _generate-openapi-setting-removeGreedyParameterSuffix:
+
+removeGreedyParameterSuffix (``boolean``)
+    Set to true to remove the ``+`` suffix on the parameter name. By default, greedy
+    labels will have a corresponding parameter name generated that will include
+    the ``+`` suffix. Given a label "/{foo+}", the parameter name will be "foo+".
+    If enabled, the parameter name will instead be "foo".
+
+    .. code-block:: json
+
+        {
+            "version": "1.0",
+            "plugins": {
+                "openapi": {
+                    "service": "smithy.example#Weather",
+                    "removeGreedyParameterSuffix": true
+                }
+            }
+        }
+
 .. _generate-openapi-setting-onHttpPrefixHeaders:
 
 onHttpPrefixHeaders (``string``)

smithy-aws-apigateway-openapi/src/main/java/software/amazon/smithy/aws/apigateway/openapi/AddDefaultRestConfigSettings.java

@@ -22,6 +22,9 @@
 
 /**
  * REST APIs require that name parameters for greedy labels are not suffixed with "+".
+ *  @see <a href="https://docs.aws.amazon.com/apigateway/latest/developerguide/setup-http-integrations.html">REST APIs</a>
+ *  which is counter to the default, like for
+ *  <a href="https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-http.html">HTTP APIs</a>.
  */
 final class AddDefaultRestConfigSettings implements ApiGatewayMapper {
     @Override

smithy-openapi/src/main/java/software/amazon/smithy/openapi/OpenApiConfig.java

@@ -223,6 +223,15 @@ public boolean getRemoveGreedyParameterSuffix() {
         return removeGreedyParameterSuffix;
     }
 
+    /**
+     * Set to true to remove the "+" suffix that is added to the generated
+     * parameter name for greedy labels.
+     *
+     * <p>By default, greedy labels will have a parameter name generated that
+     * matches the label, including the "+" suffix.</p>
+     * @param removeGreedyParameterSuffix Set to true to remove the "+" suffix
+     *                                    on generated parameter name.
+     */
     public void setRemoveGreedyParameterSuffix(boolean removeGreedyParameterSuffix) {
         this.removeGreedyParameterSuffix = removeGreedyParameterSuffix;
     }

smithy-openapi/src/main/java/software/amazon/smithy/openapi/fromsmithy/protocols/AbstractRestProtocol.java

@@ -141,8 +141,10 @@ private List<ParameterObject> createPathParameters(Context<T> context, Operation
             // Some vendors/tooling, require the "+" suffix be excluded in the generated parameter.
             // If required, the setRemoveGreedyParameterSuffix config option should be set to `true`.
             // When this option is enabled, given "/{foo+}", the parameter name will be "foo".
-            String name = (label.isGreedyLabel() && !context.getConfig().getRemoveGreedyParameterSuffix())
-                    ? label.getContent() + "+" : label.getContent();
+            String name = label.getContent();
+            if (label.isGreedyLabel() && !context.getConfig().getRemoveGreedyParameterSuffix()) {
+                name = name + "+";
+            }
 
             result.add(ModelUtils.createParameterMember(context, binding.getMember())
                     .name(name)