Loading buildSrc/src/main/kotlin/aws/sdk/ServiceLoader.kt +12 −19 Original line number Diff line number Diff line Loading @@ -104,16 +104,13 @@ fun Project.discoverServices( val models = awsModelsPath?.let { File(it) } ?: project.file("aws-models") val extrasDir = project.file("aws-models-extra") logger.info("Using model path: $models") val fileNames = fileTree(models).map { file -> file.name } logger.info("Discovered potential model files: $fileNames") val files = fileTree(models).sortedBy { file -> file.name } logger.info("Discovered potential model files: ${files.map { file -> file.name }}") val baseServices = fileTree(models) .sortedBy { file -> file.name } files .mapNotNull { file -> logger.info("Begin processing file: ${file.name}") val model = Model.assembler().addImport(file.absolutePath).assemble().result.get() val services: List<ServiceShape> = model.shapes(ServiceShape::class.java).sorted().toList() logger.info("Detected services: ${services.map { it.id.toString() }}") if (services.size > 1) { throw Exception("There must be exactly one service in each aws model file") } Loading @@ -122,7 +119,6 @@ fun Project.discoverServices( null } else { val service = services[0] logger.info("Begin processing service: ${service.id}") val title = service.expectTrait(TitleTrait::class.java).value val sdkId = service.expectTrait(ServiceTrait::class.java).sdkId Loading @@ -140,7 +136,6 @@ fun Project.discoverServices( listOf() } val processedService = AwsService( service = service.id.toString(), module = sdkId, Loading @@ -150,8 +145,6 @@ fun Project.discoverServices( extraFiles = extras.sorted(), humanName = title, ) logger.info("Successfully processed service: $processedService") processedService } } val baseModules = baseServices.map { it.module }.toSet() Loading Loading
buildSrc/src/main/kotlin/aws/sdk/ServiceLoader.kt +12 −19 Original line number Diff line number Diff line Loading @@ -104,16 +104,13 @@ fun Project.discoverServices( val models = awsModelsPath?.let { File(it) } ?: project.file("aws-models") val extrasDir = project.file("aws-models-extra") logger.info("Using model path: $models") val fileNames = fileTree(models).map { file -> file.name } logger.info("Discovered potential model files: $fileNames") val files = fileTree(models).sortedBy { file -> file.name } logger.info("Discovered potential model files: ${files.map { file -> file.name }}") val baseServices = fileTree(models) .sortedBy { file -> file.name } files .mapNotNull { file -> logger.info("Begin processing file: ${file.name}") val model = Model.assembler().addImport(file.absolutePath).assemble().result.get() val services: List<ServiceShape> = model.shapes(ServiceShape::class.java).sorted().toList() logger.info("Detected services: ${services.map { it.id.toString() }}") if (services.size > 1) { throw Exception("There must be exactly one service in each aws model file") } Loading @@ -122,7 +119,6 @@ fun Project.discoverServices( null } else { val service = services[0] logger.info("Begin processing service: ${service.id}") val title = service.expectTrait(TitleTrait::class.java).value val sdkId = service.expectTrait(ServiceTrait::class.java).sdkId Loading @@ -140,7 +136,6 @@ fun Project.discoverServices( listOf() } val processedService = AwsService( service = service.id.toString(), module = sdkId, Loading @@ -150,8 +145,6 @@ fun Project.discoverServices( extraFiles = extras.sorted(), humanName = title, ) logger.info("Successfully processed service: $processedService") processedService } } val baseModules = baseServices.map { it.module }.toSet() Loading