@@ -720,34 +720,17 @@ object SpringModelUtils {
720
720
methodId : MethodId ,
721
721
arguments : List <UtModel >,
722
722
idGenerator : () -> Int
723
- ): List < Pair <UtPrimitiveModel , UtAssembleModel > > {
723
+ ): List <Pair <UtPrimitiveModel , UtArrayModel > > {
724
724
val requestParams = collectArgumentsWithAnnotationModels(methodId, requestParamClassId, arguments)
725
725
726
726
return requestParams.map { (name, value) ->
727
727
Pair (UtPrimitiveModel (name),
728
- UtAssembleModel (
728
+ UtArrayModel (
729
729
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),
751
734
)
752
735
)
753
736
}
@@ -801,7 +784,7 @@ object SpringModelUtils {
801
784
private fun createUrlTemplateModel (
802
785
requestPath : String ,
803
786
pathVariablesModel : UtAssembleModel ,
804
- requestParamModel : List <Pair <UtPrimitiveModel , UtAssembleModel >>,
787
+ requestParamModel : List <Pair <UtPrimitiveModel , UtArrayModel >>,
805
788
idGenerator : () -> Int
806
789
): UtModel {
807
790
val requestPathModel = UtPrimitiveModel (requestPath)
@@ -851,7 +834,7 @@ object SpringModelUtils {
851
834
executable = MethodId (
852
835
classId = uriComponentsBuilderClassId,
853
836
name = " queryParam" ,
854
- parameters = listOf (stringClassId, collectionClassId ),
837
+ parameters = listOf (stringClassId, getArrayClassIdByElementClassId(objectClassId) ),
855
838
returnType = uriComponentsBuilderClassId
856
839
),
857
840
params = listOf (name, value),
0 commit comments