@@ -104,16 +104,13 @@ fun Project.discoverServices(
104
104
val models = awsModelsPath?.let { File (it) } ? : project.file(" aws-models" )
105
105
val extrasDir = project.file(" aws-models-extra" )
106
106
logger.info(" Using model path: $models " )
107
- val fileNames = fileTree(models).map { file -> file.name }
108
- logger.info(" Discovered potential model files: $fileNames " )
107
+ val files = fileTree(models).sortedBy { file -> file.name }
108
+ logger.info(" Discovered potential model files: ${files.map { file -> file.name }} " )
109
109
val baseServices =
110
- fileTree(models)
111
- .sortedBy { file -> file.name }
110
+ files
112
111
.mapNotNull { file ->
113
- logger.info(" Begin processing file: ${file.name} " )
114
112
val model = Model .assembler().addImport(file.absolutePath).assemble().result.get()
115
113
val services: List <ServiceShape > = model.shapes(ServiceShape ::class .java).sorted().toList()
116
- logger.info(" Detected services: ${services.map { it.id.toString() }} " )
117
114
if (services.size > 1 ) {
118
115
throw Exception (" There must be exactly one service in each aws model file" )
119
116
}
@@ -122,7 +119,6 @@ fun Project.discoverServices(
122
119
null
123
120
} else {
124
121
val service = services[0 ]
125
- logger.info(" Begin processing service: ${service.id} " )
126
122
val title = service.expectTrait(TitleTrait ::class .java).value
127
123
val sdkId =
128
124
service.expectTrait(ServiceTrait ::class .java).sdkId
@@ -140,18 +136,15 @@ fun Project.discoverServices(
140
136
listOf ()
141
137
}
142
138
143
- val processedService =
144
- AwsService (
145
- service = service.id.toString(),
146
- module = sdkId,
147
- moduleDescription = " AWS SDK for $title " ,
148
- modelFile = file,
149
- // Order is important for the versions.toml model hash calculation
150
- extraFiles = extras.sorted(),
151
- humanName = title,
152
- )
153
- logger.info(" Successfully processed service: $processedService " )
154
- processedService
139
+ AwsService (
140
+ service = service.id.toString(),
141
+ module = sdkId,
142
+ moduleDescription = " AWS SDK for $title " ,
143
+ modelFile = file,
144
+ // Order is important for the versions.toml model hash calculation
145
+ extraFiles = extras.sorted(),
146
+ humanName = title,
147
+ )
155
148
}
156
149
}
157
150
val baseModules = baseServices.map { it.module }.toSet()
0 commit comments