Method-declaration : separate lines when wrapped

config/spotless/formatting.xml

@@ -363,7 +363,8 @@
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration"
+                 value="separate_lines_if_wrapped"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>

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

@@ -64,7 +64,8 @@ public Map<String, List<String>> updateSecurity(
             Context<? extends Trait> context,
             Shape shape,
             SecuritySchemeConverter<? extends Trait> converter,
-            Map<String, List<String>> requirement) {
+            Map<String, List<String>> requirement
+    ) {
         // Only modify requirements that exactly match the updated scheme.
         if (requirement.size() != 1
                 || !requirement.keySet().iterator().next().equals(converter.getOpenApiAuthSchemeName())) {
@@ -87,7 +88,8 @@ public OperationObject updateOperation(
             OperationShape shape,
             OperationObject operation,
             String httpMethodName,
-            String path) {
+            String path
+    ) {
         ServiceShape service = context.getService();
         AuthorizerIndex authorizerIndex = AuthorizerIndex.of(context.getModel());
 
@@ -142,7 +144,8 @@ public OpenApi after(Context<? extends Trait> context, OpenApi openapi) {
     private OpenApi addComputedAuthorizers(
             Context<? extends Trait> context,
             OpenApi openApi,
-            AuthorizersTrait trait) {
+            AuthorizersTrait trait
+    ) {
         OpenApi.Builder builder = openApi.toBuilder();
         ComponentsObject.Builder components = openApi.getComponents().toBuilder();
 
@@ -167,7 +170,8 @@ private OpenApi addComputedAuthorizers(
     private boolean isAuthConverterMatched(
             Context<? extends Trait> context,
             SecuritySchemeConverter<? extends Trait> converter,
-            ShapeId scheme) {
+            ShapeId scheme
+    ) {
         return converter.getAuthSchemeId().equals(scheme)
                 && context.getService().hasTrait(converter.getAuthSchemeType());
     }
@@ -176,7 +180,8 @@ private <T extends Trait> SecurityScheme convertAuthScheme(
             Context<? extends Trait> context,
             SecuritySchemeConverter<T> converter,
             AuthorizerDefinition authorizer,
-            String authorizerName) {
+            String authorizerName
+    ) {
         T authTrait = context.getService().expectTrait(converter.getAuthSchemeType());
         SecurityScheme createdScheme = converter.createSecurityScheme(context, authTrait);
         SecurityScheme.Builder schemeBuilder = createdScheme.toBuilder();

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

@@ -81,7 +81,8 @@ private static PathItem addPreflightIntegration(
             Context<? extends Trait> context,
             String path,
             PathItem pathItem,
-            CorsTrait corsTrait) {
+            CorsTrait corsTrait
+    ) {
         // Filter out any path for which an OPTIONS handler has already been defined
         if (pathItem.getOptions().isPresent()) {
             LOGGER.fine(() -> path + " already defines an OPTIONS request, so no need to generate CORS-preflight");
@@ -99,7 +100,8 @@ private static <T extends Trait> Map<CorsHeader, String> deduceCorsHeaders(
             Context<T> context,
             String path,
             PathItem pathItem,
-            CorsTrait corsTrait) {
+            CorsTrait corsTrait
+    ) {
         Map<CorsHeader, String> corsHeaders = new HashMap<>();
         corsHeaders.put(CorsHeader.MAX_AGE, String.valueOf(corsTrait.getMaxAge()));
         corsHeaders.put(CorsHeader.ALLOW_ORIGIN, corsTrait.getOrigin());
@@ -153,7 +155,8 @@ private static <T extends Trait> Map<CorsHeader, String> deduceCorsHeaders(
 
     private static <T extends Trait> Set<String> getSecuritySchemeRequestHeaders(
             Context<? extends Trait> context,
-            SecuritySchemeConverter<T> converter) {
+            SecuritySchemeConverter<T> converter
+    ) {
         T t = context.getService().expectTrait(converter.getAuthSchemeType());
         return converter.getAuthRequestHeaders(context, t);
     }
@@ -179,7 +182,8 @@ private static OperationObject createPreflightOperation(
             Context<? extends Trait> context,
             String path,
             PathItem pathItem,
-            Map<CorsHeader, String> headers) {
+            Map<CorsHeader, String> headers
+    ) {
         return OperationObject.builder()
                 .tags(ListUtils.of("CORS"))
                 .security(Collections.emptyList())
@@ -226,7 +230,8 @@ private static ResponseObject createPreflightResponse(Map<CorsHeader, String> he
     private static ObjectNode createPreflightIntegration(
             Context<? extends Trait> context,
             Map<CorsHeader, String> headers,
-            PathItem pathItem) {
+            PathItem pathItem
+    ) {
         IntegrationResponse.Builder responseBuilder = IntegrationResponse.builder().statusCode("200");
 
         // Add each CORS header to the mock integration response.

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

@@ -44,7 +44,8 @@ public OperationObject postProcessOperation(
             OperationShape shape,
             OperationObject operation,
             String method,
-            String path) {
+            String path
+    ) {
         return context.getService()
                 .getTrait(CorsTrait.class)
                 .map(trait -> addCorsHeadersToResponses(context, shape, operation, method, trait))
@@ -56,7 +57,8 @@ private OperationObject addCorsHeadersToResponses(
             OperationShape shape,
             OperationObject operationObject,
             String method,
-            CorsTrait trait) {
+            CorsTrait trait
+    ) {
         OperationObject.Builder builder = operationObject.toBuilder();
 
         for (Map.Entry<String, ResponseObject> entry : operationObject.getResponses().entrySet()) {
@@ -79,7 +81,8 @@ private ResponseObject createUpdatedResponseWithCorsHeaders(
             OperationObject operationObject,
             String method,
             CorsTrait trait,
-            ResponseObject response) {
+            ResponseObject response
+    ) {
         // Determine which headers have been added to the response.
         List<String> headers = new ArrayList<>();
 

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

@@ -88,7 +88,8 @@ private Node updateGatewayResponses(Context<? extends Trait> context, CorsTrait
     private Node updateGatewayResponses(
             Context<? extends Trait> context,
             CorsTrait trait,
-            ObjectNode gatewayResponses) {
+            ObjectNode gatewayResponses
+    ) {
         Map<CorsHeader, String> corsHeaders = new HashMap<>();
         corsHeaders.put(CorsHeader.ALLOW_ORIGIN, trait.getOrigin());
 
@@ -110,7 +111,8 @@ private ObjectNode updateGatewayResponse(
             Context<? extends Trait> context,
             CorsTrait trait,
             Map<CorsHeader, String> sharedHeaders,
-            ObjectNode gatewayResponse) {
+            ObjectNode gatewayResponse
+    ) {
         ObjectNode responseParameters = gatewayResponse
                 .getObjectMember(RESPONSE_PARAMETERS_KEY)
                 .orElse(Node.objectNode());

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

@@ -51,7 +51,8 @@ public OperationObject updateOperation(
             OperationShape shape,
             OperationObject operationObject,
             String httpMethod,
-            String path) {
+            String path
+    ) {
         CorsTrait cors = context.getService().getTrait(CorsTrait.class).orElse(null);
 
         if (cors == null) {
@@ -69,7 +70,8 @@ private OperationObject updateOperation(
             OperationShape shape,
             OperationObject operationObject,
             CorsTrait cors,
-            ObjectNode integrationObject) {
+            ObjectNode integrationObject
+    ) {
         ObjectNode updated = updateIntegrationWithCors(
                 context,
                 operationObject,
@@ -87,7 +89,8 @@ private ObjectNode updateIntegrationWithCors(
             OperationObject operationObject,
             OperationShape shape,
             ObjectNode integrationNode,
-            CorsTrait cors) {
+            CorsTrait cors
+    ) {
         ObjectNode responses = integrationNode.getObjectMember(RESPONSES_KEY).orElse(Node.objectNode());
 
         // Always include a "default" response that has the same HTTP response code.
@@ -132,7 +135,8 @@ private ObjectNode updateIntegrationResponse(
             OperationShape shape,
             Map<CorsHeader, String> corsHeaders,
             Set<String> deduced,
-            ObjectNode response) {
+            ObjectNode response
+    ) {
         Map<CorsHeader, String> responseHeaders = new HashMap<>(corsHeaders);
         ObjectNode responseParams = response.getObjectMember(RESPONSE_PARAMETERS_KEY).orElseGet(Node::objectNode);
 

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

@@ -41,7 +41,8 @@ public OperationObject updateOperation(
             OperationShape shape,
             OperationObject operation,
             String httpMethod,
-            String path) {
+            String path
+    ) {
         IntegrationTraitIndex index = IntegrationTraitIndex.of(context.getModel());
         return index.getIntegrationTrait(context.getService(), shape)
                 .map(trait -> operation.toBuilder()
@@ -62,7 +63,8 @@ static ObjectNode createIntegration(MockIntegrationTrait integration) {
     private static ObjectNode createIntegration(
             Context<? extends Trait> context,
             OperationShape shape,
-            Trait integration) {
+            Trait integration
+    ) {
         ObjectNode integrationNode;
         if (integration instanceof MockIntegrationTrait) {
             integrationNode = integration.toNode().expectObjectNode().withMember("type", Node.from("mock"));
@@ -86,7 +88,8 @@ private static ObjectNode createIntegration(
     private static void validateTraitConfiguration(
             IntegrationTrait trait,
             Context<? extends Trait> context,
-            OperationShape operation) {
+            OperationShape operation
+    ) {
         // For HTTP APIs, API Gateway requires that the payloadFormatVersion is set on integrations.
         // https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-swagger-extensions-integration.html
         // If the payloadFormatVersion has not been set on an integration and the apiGatewayType has been set to "HTTP",

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

@@ -57,7 +57,8 @@ public OperationObject updateOperation(
             OperationShape shape,
             OperationObject operation,
             String httpMethod,
-            String path) {
+            String path
+    ) {
         return shape.getTrait(RequestValidatorTrait.class)
                 .map(RequestValidatorTrait::getValue)
                 .map(value -> operation.toBuilder().putExtension(REQUEST_VALIDATOR, value).build())

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

@@ -95,7 +95,8 @@ public OperationObject updateOperation(
                     OperationShape shape,
                     OperationObject operation,
                     String httpMethodName,
-                    String path) {
+                    String path
+            ) {
                 return matchesApiType(context)
                         ? delegate.updateOperation(context, shape, operation, httpMethodName, path)
                         : operation;
@@ -107,7 +108,8 @@ public OperationObject postProcessOperation(
                     OperationShape shape,
                     OperationObject operation,
                     String httpMethodName,
-                    String path) {
+                    String path
+            ) {
                 return matchesApiType(context)
                         ? delegate.postProcessOperation(context, shape, operation, httpMethodName, path)
                         : operation;
@@ -126,7 +128,8 @@ public ParameterObject updateParameter(
                     OperationShape operation,
                     String httpMethodName,
                     String path,
-                    ParameterObject parameterObject) {
+                    ParameterObject parameterObject
+            ) {
                 return matchesApiType(context)
                         ? delegate.updateParameter(context, operation, httpMethodName, path, parameterObject)
                         : parameterObject;
@@ -138,7 +141,8 @@ public RequestBodyObject updateRequestBody(
                     OperationShape operation,
                     String httpMethodName,
                     String path,
-                    RequestBodyObject requestBody) {
+                    RequestBodyObject requestBody
+            ) {
                 return matchesApiType(context)
                         ? delegate.updateRequestBody(context, operation, httpMethodName, path, requestBody)
                         : requestBody;
@@ -151,7 +155,8 @@ public ResponseObject updateResponse(
                     String status,
                     String httpMethodName,
                     String path,
-                    ResponseObject response) {
+                    ResponseObject response
+            ) {
                 return matchesApiType(context)
                         ? delegate.updateResponse(context, operation, status, httpMethodName, path, response)
                         : response;
@@ -168,7 +173,8 @@ public void before(Context<? extends Trait> context, OpenApi.Builder builder) {
             public SecurityScheme updateSecurityScheme(
                     Context<? extends Trait> context,
                     Trait authTrait,
-                    SecurityScheme securityScheme) {
+                    SecurityScheme securityScheme
+            ) {
                 return matchesApiType(context)
                         ? delegate.updateSecurityScheme(context, authTrait, securityScheme)
                         : securityScheme;
@@ -179,7 +185,8 @@ public Map<String, List<String>> updateSecurity(
                     Context<? extends Trait> context,
                     Shape shape,
                     SecuritySchemeConverter<? extends Trait> converter,
-                    Map<String, List<String>> requirement) {
+                    Map<String, List<String>> requirement
+            ) {
                 return matchesApiType(context)
                         ? delegate.updateSecurity(context, shape, converter, requirement)
                         : requirement;

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

@@ -37,7 +37,8 @@ static <T extends Trait> Set<String> deduceOperationResponseHeaders(
             Context<T> context,
             OperationObject operationObject,
             OperationShape shape,
-            CorsTrait cors) {
+            CorsTrait cors
+    ) {
         // The deduced response headers of an operation consist of any headers
         // returned by security schemes, any headers returned by the protocol,
         // and any headers explicitly modeled on the operation.

smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/AuthorizersTraitValidator.java

@@ -58,7 +58,8 @@ private List<ValidationEvent> validate(Model model, ServiceShape service) {
     private Optional<ValidationEvent> validateAuthSchema(
             Map<String, AuthorizerDefinition> authorizers,
             Model model,
-            ServiceShape service) {
+            ServiceShape service
+    ) {
         Set<ShapeId> authSchemes = ServiceIndex.of(model).getAuthSchemes(service).keySet();
 
         String invalidMappings = authorizers.entrySet()
@@ -89,7 +90,8 @@ private Optional<ValidationEvent> validateAuthSchema(
      */
     private Optional<ValidationEvent> validateEnableSimpleResponsesConfig(
             Map<String, AuthorizerDefinition> authorizers,
-            ServiceShape service) {
+            ServiceShape service
+    ) {
         String invalidConfigs = authorizers.entrySet()
                 .stream()
                 .filter(entry -> entry.getValue().getEnableSimpleResponses().isPresent())

smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResource.java

@@ -222,7 +222,8 @@ public Builder putPropertyDefinition(String propertyName, CfnResourceProperty de
 
         public Builder updatePropertyDefinition(
                 String propertyName,
-                Function<CfnResourceProperty, CfnResourceProperty> updater) {
+                Function<CfnResourceProperty, CfnResourceProperty> updater
+        ) {
             CfnResourceProperty definition = propertyDefinitions.get(propertyName);
 
             // Don't update if we don't have a property or it's already locked.