refactor: Update libs and apply kotlin style changes

Changes: - bump gradle to 7.3.2 - bump kotlin to 1.6.10 - add jvm 11 compile time optimizations for kotlin - add helper function `missingId` - apply ktlint formatting - remove redundant typing or unused variables

Author: Michael Brewer

software/build.gradle.kts

@@ -1,18 +1,18 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import com.github.jk1.license.render.ReportRenderer
-import com.github.jk1.license.render.InventoryHtmlReportRenderer
 import com.github.jk1.license.filter.DependencyFilter
 import com.github.jk1.license.filter.LicenseBundleNormalizer
+import com.github.jk1.license.render.InventoryHtmlReportRenderer
+import com.github.jk1.license.render.ReportRenderer
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
- kotlin("jvm") version "1.6.0"
- kotlin("plugin.serialization") version "1.5.31"
- id("com.github.johnrengelman.shadow") version "5.1.0"
+ kotlin("jvm") version "1.6.10"
+ kotlin("plugin.serialization") version "1.5.32"
+ id("com.github.johnrengelman.shadow") version "7.1.0"
  id("com.github.jk1.dependency-license-report") version "2.0"
 }
 
 licenseReport {
- renderers = arrayOf<ReportRenderer>(InventoryHtmlReportRenderer("report.html","Backend"))
+ renderers = arrayOf<ReportRenderer>(InventoryHtmlReportRenderer("report.html", "Backend"))
  filters = arrayOf<DependencyFilter>(LicenseBundleNormalizer())
 }
 
@@ -35,6 +35,7 @@ tasks.test {
  useJUnitPlatform()
 }
 
-tasks.withType<KotlinCompile>() {
+tasks.withType<KotlinCompile> {
  kotlinOptions.jvmTarget = "11"
-}
+ kotlinOptions.freeCompilerArgs = listOf("-Xjsr305=strict -Xstring-concat=indy-with-constants")
+}

software/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

software/settings.gradle.kts

@@ -1,2 +1 @@
 rootProject.name = "serverless-kotlin-demo"
-

software/src/main/kotlin/com/amazonaws/sample/APIGatewayV2HTTPResponseUtil.kt

@@ -0,0 +1,12 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT-0
+
+package com.amazonaws.sample
+
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse
+
+fun missingId() = APIGatewayV2HTTPResponse().apply {
+ statusCode = 500
+ headers = mapOf("Content-Type" to "application/json")
+ body = """{ "message": "Missing 'id' parameter in path" }"""
+}

software/src/main/kotlin/com/amazonaws/sample/DeleteProductHandler.kt

@@ -24,20 +24,18 @@ class DeleteProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2H
  override fun handleRequest(event: APIGatewayV2HTTPEvent, context: Context): APIGatewayV2HTTPResponse {
  val logger = context.logger
 
- val id = event.pathParameters?.get("id") ?: return APIGatewayV2HTTPResponse().apply {
- statusCode = 500
- headers = mapOf("Content-Type" to "application/json")
- body = """{ "message": "Missing 'id' parameter in path" }"""
- }
+ val id = event.pathParameters?.get("id") ?: return missingId()
 
  try {
  runBlocking {
- dynamoDbClient.deleteItem(DeleteItemRequest {
- tableName = productTable
- key = mapOf("PK" to AttributeValue.S(id))
- })
+ dynamoDbClient.deleteItem(
+ DeleteItemRequest {
+ tableName = productTable
+ key = mapOf("PK" to AttributeValue.S(id))
+ }
+ )
  }
- } catch (e : Exception) {
+ } catch (e: Exception) {
  logger.log("ERROR ${e.message}")
  return APIGatewayV2HTTPResponse().apply {
  statusCode = 500
@@ -52,4 +50,4 @@ class DeleteProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2H
  body = """{"message": "Product deleted"}"""
  }
  }
-}
+}

software/src/main/kotlin/com/amazonaws/sample/DynamoDBExtensions.kt

@@ -5,5 +5,5 @@ package com.amazonaws.sample
 
 import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
 
-val AttributeValue.asString : String get() = (this as AttributeValue.S).value
-val AttributeValue.asFloat : Float get() = (this as AttributeValue.N).value.toFloat()
+val AttributeValue.asString get() = (this as AttributeValue.S).value
+val AttributeValue.asFloat get() = (this as AttributeValue.N).value.toFloat()

software/src/main/kotlin/com/amazonaws/sample/GetAllProductsHandler.kt

@@ -29,12 +29,14 @@ class GetAllProductsHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2
 
  val scanResponse = try {
  runBlocking {
- dynamoDbClient.scan(ScanRequest {
- tableName = productTable
- limit = 20
- })
+ dynamoDbClient.scan(
+ ScanRequest {
+ tableName = productTable
+ limit = 20
+ }
+ )
  }
- } catch (e : Exception) {
+ } catch (e: Exception) {
  logger.log("ERROR: ${e.message}")
  return APIGatewayV2HTTPResponse().apply {
  statusCode = 500
@@ -45,7 +47,7 @@ class GetAllProductsHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2
 
  val products = ArrayList<Product>()
 
- scanResponse.items?.map { it
+ scanResponse.items?.map {
  val id = it.getValue("PK").asString
  val name = it.getValue("name").asString
  val price = it.getValue("price").asFloat
@@ -58,4 +60,4 @@ class GetAllProductsHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2
  body = Json.encodeToString(Products(products))
  }
  }
-}
+}

software/src/main/kotlin/com/amazonaws/sample/GetProductHandler.kt

@@ -27,23 +27,17 @@ class GetProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTP
  override fun handleRequest(event: APIGatewayV2HTTPEvent, context: Context): APIGatewayV2HTTPResponse {
  val logger = context.logger
 
- val requestId = event.pathParameters["id"]
- requestId ?: run {
- logger.log("WARN: Missing 'id' parameter in path")
- return APIGatewayV2HTTPResponse().apply {
- statusCode = 400
- headers = mapOf("Content-Type" to "application/json")
- body = """{ "message": "Missing 'id' parameter in path" }"""
- }
- }
+ val requestId = event.pathParameters?.get("id") ?: return missingId()
 
- logger.log("INFO: Fetching product [$requestId]");
+ logger.log("INFO: Fetching product [$requestId]")
 
  val response = runBlocking {
- dynamoDbClient.getItem(GetItemRequest {
- tableName = productTable
- key = mapOf("PK" to AttributeValue.S(requestId))
- })
+ dynamoDbClient.getItem(
+ GetItemRequest {
+ tableName = productTable
+ key = mapOf("PK" to AttributeValue.S(requestId))
+ }
+ )
  }
 
  val id = response.item?.getValue("PK")?.asString
@@ -64,4 +58,4 @@ class GetProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTP
  body = Json.encodeToString(Product(id, name, price))
  }
  }
-}
+}

software/src/main/kotlin/com/amazonaws/sample/PutProductHandler.kt

@@ -28,14 +28,7 @@ class PutProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTP
  val logger = context.logger
  logger.log(event.toString())
 
- val id = event.pathParameters["id"] ?: let {
- logger.log("WARN: Missing 'id' parameter in path")
- return APIGatewayV2HTTPResponse().apply {
- statusCode = 400
- headers = mapOf("Content-Type" to "application/json")
- body = """{ "message": "Missing 'id' parameter in path" }"""
- }
- }
+ val id = event.pathParameters?.get("id") ?: return missingId()
 
  if (event.body == null || event.body.isEmpty()) {
  return APIGatewayV2HTTPResponse().apply {
@@ -46,7 +39,7 @@ class PutProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTP
  }
 
  val product = try {
-  Json.decodeFromString<Product>(event.body)
+ Json.decodeFromString<Product>(event.body)
  } catch (e: Exception) {
  logger.log(e.message)
  return APIGatewayV2HTTPResponse().apply {
@@ -58,7 +51,7 @@ class PutProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTP
 
  logger.log("Product: $product")
 
- if(id != product.id) {
+ if (id != product.id) {
  logger.log("ERROR: Product ID in path ($id) does not match product ID in body (${product.id})")
  return APIGatewayV2HTTPResponse().apply {
  statusCode = 400
@@ -74,10 +67,12 @@ class PutProductHandler : RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTP
  )
 
  runBlocking {
- dynamoDbClient.putItem(PutItemRequest {
- tableName = productTable
- item = itemValues
- })
+ dynamoDbClient.putItem(
+ PutItemRequest {
+ tableName = productTable
+ item = itemValues
+ }
+ )
  }
 
  return APIGatewayV2HTTPResponse().apply {

software/src/main/kotlin/com/amazonaws/sample/model/Product.kt

@@ -6,4 +6,4 @@ package com.amazonaws.sample.model
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Product(val id: String, val name: String, val price: Float)
+data class Product(val id: String, val name: String, val price: Float)