Unverified Commit 85d2ace0 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Upgrade Kotlin and Ktlint (#2392) 

* Upgrade Kotlin to 1.7.21

* Upgrade Ktlint to 0.48.2

* Run `pre-commit run --all-files` to fix broken Ktlints

* Fix string comparison broken by code formatting
parent ec1a5515

.editorconfig

+7 −1
Original line number Diff line number Diff line
@@ -9,5 +9,11 @@ indent_size = 4 
indent_style = space

insert_final_newline = true

max_line_length = 120



# Ktlint-specific config

disabled_rules = filename, max-line-length, argument-list-wrapping, parameter-list-wrapping
 
ktlint_standard = enabled

ktlint_experimental = disabled

ktlint_standard_filename = disabled

ktlint_standard_max-line-length = disabled

ktlint_standard_argument-list-wrapping = disabled

ktlint_standard_parameter-list-wrapping = disabled

.pre-commit-config.yaml

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ repos: 
    files: ^.*$

    pass_filenames: false

- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks

  rev: v2.5.0

  rev: v2.6.0

  hooks:

  - id: pretty-format-kotlin

    args: [--autofix, --ktlint-version, 0.46.1]

    args: [--autofix, --ktlint-version, 0.48.2]

  - id: pretty-format-yaml

    args: [--autofix, --indent, '2']

  - id: pretty-format-rust

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/RegionDecorator.kt

+3 −1
Original line number Diff line number Diff line
@@ -130,7 +130,9 @@ class RegionDecorator : ClientCodegenDecorator { 
            object : EndpointCustomization {

                override fun loadBuiltInFromServiceConfig(parameter: Parameter, configRef: String): Writable? {

                    return when (parameter.builtIn) {

                        Builtins.REGION.builtIn -> writable { rust("$configRef.region.as_ref().map(|r|r.as_ref().to_owned())") }

                        Builtins.REGION.builtIn -> writable {

                            rust("$configRef.region.as_ref().map(|r|r.as_ref().to_owned())")

                        }

                        else -> null

                    }

                }

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/glacier/AccountIdAutofill.kt

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ class AccountIdAutofill : OperationCustomization() { 
            val input = operation.inputShape(model)

            return if (input.memberNames.contains("accountId")) {

                AccountIdAutofill()

            } else null

            } else {

                null

            }

        }

    }

}

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/route53/Route53Decorator.kt

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ class Route53Decorator : ClientCodegenDecorator { 
            operation.inputShape(codegenContext.model).members().find { it.hasTrait<TrimResourceId>() }

        return if (hostedZoneMember != null) {

            baseCustomizations + TrimResourceIdCustomization(codegenContext.symbolProvider.toMemberName(hostedZoneMember))

        } else baseCustomizations

        } else {

            baseCustomizations

        }

    }



    private fun isResourceId(shape: Shape): Boolean {