Kotlin: check methods to contains name 'ids' and with type List convert to List<Long> (#35)

Co-authored-by: andrey <palchikov@uteka.ru>

Author: qnqatop

kotlin/kotlin_client.go

@@ -36,7 +36,7 @@ const (
 	DefaultMap       = "emptyMap()"
 	DefaultLocalTime = "LocalTime.now()"
 
-	version = "1.0.0"
+	version = "1.0.1"
 )
 
 var (
@@ -139,7 +139,6 @@ func (g *Generator) prepareTemplateData() templateData {
 	data := templateData{GeneratorData: gen.DefaultGeneratorData().AddLangAndLocalVersion(version, "kotlin"), PackageAPI: g.settings.PackageAPI, Imports: g.settings.Imports, Class: g.settings.Class}
 
 	modelsMap := make(map[string]Model)
-	servicesMap := make(map[string][]Method)
 
 	for serviceName, service := range g.schema.Services {
 		var (
@@ -166,14 +165,8 @@ func (g *Generator) prepareTemplateData() templateData {
 			params = append(params, p)
 		}
 		method.Parameters = params
+		normalizeMethodReturnType(&method)
 		data.Methods = append(data.Methods, method)
-		if g.settings.IsProtocol {
-			parts := strings.SplitN(method.Name, ".", 2)
-			if len(parts) != 2 {
-				continue
-			}
-			servicesMap[parts[0]] = append(servicesMap[parts[0]], method)
-		}
 	}
 
 	for _, v := range modelsMap {
@@ -188,6 +181,13 @@ func (g *Generator) prepareTemplateData() templateData {
 	return data
 }
 
+// normalizeMethodReturnType check suffix ids and type list convert to List<Long>
+func normalizeMethodReturnType(method *Method) {
+	if strings.HasSuffix(strings.ToLower(method.Name), "ids") && method.Returns.Type == "List<Int>" {
+		method.Returns.Type = "List<Long>"
+	}
+}
+
 func (g *Generator) fillIsInitial(data *templateData) {
 	modelByName := make(map[string]*Model, len(data.Models))
 	for i := range data.Models {
@@ -468,7 +468,7 @@ func kotlinDefault(smdType string) string {
 	}
 
 	if strings.HasPrefix(smdType, Map) {
-		return DefaultList
+		return DefaultMap
 	}
 
 	return smdType

kotlin/testdata/arith.go

@@ -17,8 +17,8 @@ type Point struct {
 	Z               int       `json:"-"`
 	CartId          string    `json:"cartOd"`          // version string id - 1
 	ID              int       `json:"id"`              // version id - 1
-	BaseID          int       `json:"baseId"`          // version id - 2
-	SecondID        int       `json:"secondID"`        // version id - 3
+	BaseID          int64     `json:"baseId"`          // version id - 2
+	SecondID        int32     `json:"secondID"`        // version id - 3
 	SecondIDs       []int     `json:"secondIDs"`       // version multi id
 	CartIDs         []string  `json:"cartIDs"`         // version multi string id
 	CreatedAt       string    `json:"createdAt"`       // version date - 1
@@ -48,6 +48,10 @@ func (as ArithService) GetByID(ctx context.Context, cartId string, categoryId in
 	return &Point{}, nil
 }
 
+func (as ArithService) GetSecondIds(ctx context.Context) []int {
+	return nil
+}
+
 func (as ArithService) GetByLatLong(ctx context.Context, categoryId int, baseID int, lat, lon float64) (*Point, error) {
 	return &Point{}, nil
 }

kotlin/testdata/protocol.generated.kt

@@ -1,4 +1,4 @@
-/// Code generated from jsonrpc schema by rpcgen v2.5.x with kotlin v1.0.0; DO NOT EDIT.
+/// Code generated from jsonrpc schema by rpcgen v2.5.x with kotlin v1.0.1; DO NOT EDIT.
 package api
 
 import com.google.gson.reflect.TypeToken
@@ -171,6 +171,14 @@ interface Api : Transport {
         "arith.GetPoints",
     )
 
+    fun arithGetSecondIds(
+        vararg transportOptions: TransportOption,
+    ) = request(
+        transportOptions,
+        object : TypeToken<ApiResponse<List<Long>>>() {},
+        "arith.GetSecondIds",
+    )
+
     /**
      * Multiply multiples two digits and returns result.
      * @return 

kotlin/testdata/rpc.generated.kt

@@ -1,4 +1,4 @@
-/// Code generated from jsonrpc schema by rpcgen v2.5.x with kotlin v1.0.0; DO NOT EDIT.
+/// Code generated from jsonrpc schema by rpcgen v2.5.x with kotlin v1.0.1; DO NOT EDIT.
 package api.model
 
 import java.time.LocalTime