Skip to content

Commit b30aea3

Browse files
committed
Pass array as varargs param to set queryParams
1 parent 031fa2b commit b30aea3

File tree

1 file changed

+8
-25
lines changed

1 file changed

+8
-25
lines changed

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/SpringModelUtils.kt

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -720,34 +720,17 @@ object SpringModelUtils {
720720
methodId: MethodId,
721721
arguments: List<UtModel>,
722722
idGenerator: () -> Int
723-
): List< Pair<UtPrimitiveModel, UtAssembleModel> > {
723+
): List<Pair<UtPrimitiveModel, UtArrayModel>> {
724724
val requestParams = collectArgumentsWithAnnotationModels(methodId, requestParamClassId, arguments)
725725

726726
return requestParams.map { (name, value) ->
727727
Pair(UtPrimitiveModel(name),
728-
UtAssembleModel(
728+
UtArrayModel(
729729
id = idGenerator(),
730-
classId = listClassId,
731-
modelName = "queryParams",
732-
instantiationCall = UtExecutableCallModel(
733-
instance = null,
734-
executable = constructorId(java.util.ArrayList::class.id),
735-
params = emptyList()
736-
),
737-
modificationsChainProvider = {
738-
listOf(
739-
UtExecutableCallModel(
740-
instance = this,
741-
executable = methodId(
742-
classId = listClassId,
743-
name = "add",
744-
returnType = booleanClassId,
745-
arguments = arrayOf(Object::class.id),
746-
),
747-
params = listOf(value)
748-
)
749-
)
750-
}
730+
classId = getArrayClassIdByElementClassId(objectClassId),
731+
length = 1,
732+
constModel = UtNullModel(objectClassId),
733+
stores = mutableMapOf(0 to value),
751734
)
752735
)
753736
}
@@ -801,7 +784,7 @@ object SpringModelUtils {
801784
private fun createUrlTemplateModel(
802785
requestPath: String,
803786
pathVariablesModel: UtAssembleModel,
804-
requestParamModel: List<Pair<UtPrimitiveModel, UtAssembleModel>>,
787+
requestParamModel: List<Pair<UtPrimitiveModel, UtArrayModel>>,
805788
idGenerator: () -> Int
806789
): UtModel {
807790
val requestPathModel = UtPrimitiveModel(requestPath)
@@ -851,7 +834,7 @@ object SpringModelUtils {
851834
executable = MethodId(
852835
classId = uriComponentsBuilderClassId,
853836
name = "queryParam",
854-
parameters = listOf(stringClassId, collectionClassId),
837+
parameters = listOf(stringClassId, getArrayClassIdByElementClassId(objectClassId)),
855838
returnType = uriComponentsBuilderClassId
856839
),
857840
params = listOf(name, value),

0 commit comments

Comments
 (0)