Skip to content

Commit 2f94f76

Browse files
committed
Fix code generation issues
1 parent 9bc8e4d commit 2f94f76

4 files changed

Lines changed: 1191 additions & 927 deletions

File tree

code-generator/definitions.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { pascalCase } from 'change-case'
55

66
const outputDir = '../src/main/java/com/ringcentral/definitions'
77

8-
const doc = yaml.safeLoad(fs.readFileSync('/Users/tyler.liu/src/dotnet/RingCentral.Net/code-generator/rc-platform-adjusted.yml', 'utf8'))
8+
const doc = yaml.safeLoad(fs.readFileSync('/Users/tyler.liu/src/dotnet/RingCentral.Net/code-generator/rc-platform.yml', 'utf8'))
99
const definitions = doc.definitions
1010
const models = Object.keys(definitions).map(k => ({ name: k, ...definitions[k] }))
1111
.filter(m => m.type !== 'array')
@@ -18,6 +18,8 @@ models.forEach(m => {
1818
const normalizeType = f => {
1919
if (f.type === 'integer') {
2020
return 'Long'
21+
} else if(f.type === 'number') {
22+
return 'Double'
2123
} else if (f.type === 'array') {
2224
return `${normalizeType(f.items)}[]`
2325
} else if (f.type === undefined || f.type === 'object') {

code-generator/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
},
88
"dependencies": {
99
"change-case": "^4.1.1",
10-
"js-yaml": "^3.13.1",
10+
"js-yaml": "^3.14.0",
1111
"lower-case-first": "^2.0.1",
12-
"ramda": "^0.26.1"
12+
"ramda": "^0.27.1"
1313
},
1414
"devDependencies": {
15-
"@babel/core": "^7.7.7",
16-
"@babel/preset-env": "^7.7.7",
17-
"@babel/register": "^7.7.7",
18-
"standard": "^14.3.1",
19-
"yarn-upgrade-all": "^0.5.2"
15+
"@babel/core": "^7.11.6",
16+
"@babel/preset-env": "^7.11.5",
17+
"@babel/register": "^7.11.5",
18+
"standard": "^14.3.4",
19+
"yarn-upgrade-all": "^0.5.4"
2020
}
2121
}

code-generator/paths.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import yaml from 'js-yaml'
22
import fs from 'fs'
33
import * as R from 'ramda'
4-
import { pascalCase, titleCase } from 'change-case'
4+
import { pascalCase, capitalCase } from 'change-case'
55
import { lowerCaseFirst } from 'lower-case-first'
66
import path from 'path'
77

88
import { normalizePath, deNormalizePath, getResponseType, appendCodeToFile } from './utils'
99

1010
const outputDir = '../src/main/java/com/ringcentral/paths'
1111

12-
const doc = yaml.safeLoad(fs.readFileSync('/Users/tyler.liu/src/dotnet/RingCentral.Net/code-generator/rc-platform-adjusted.yml', 'utf8'))
12+
const doc = yaml.safeLoad(fs.readFileSync('/Users/tyler.liu/src/dotnet/RingCentral.Net/code-generator/rc-platform.yml', 'utf8'))
1313

1414
// Delete /restapi/oauth/authorize: https://git.ringcentral.com/platform/api-metadata-specs/issues/26
1515
delete doc.paths['/restapi/oauth/authorize']
@@ -181,7 +181,7 @@ const generate = (prefix = '/') => {
181181
code += `
182182
183183
/**
184-
* Operation: ${operation.detail.summary || titleCase(operation.detail.operationId)}
184+
* Operation: ${operation.detail.summary || capitalCase(operation.detail.operationId)}
185185
* Http ${method} ${operation.endpoint}
186186
*/
187187
${methodParams.join(', ').includes(' = ') ? '@JvmOverloads ' : ''}fun ${smartMethod.toLowerCase()}(${methodParams.join(', ')}) : ${responseType}?
@@ -246,14 +246,3 @@ const generate = (prefix = '/') => {
246246
}
247247

248248
generate('/')
249-
250-
const mmsFolderPath = path.join(outputDir, 'restapi', 'account', 'extension', 'mms')
251-
// fs.mkdirSync(mmsFolderPath)
252-
appendCodeToFile(path.join(mmsFolderPath, 'Index.kt'), `/**
253-
* Operation: Create MMS Message
254-
* Http Post /restapi/v1.0/account/{accountId}/extension/{extensionId}/mms
255-
*/
256-
fun post(createMMSMessage: com.ringcentral.definitions.CreateMMSMessage): com.ringcentral.definitions.GetMessageInfoResponse? {
257-
val rb: okhttp3.ResponseBody = rc.post(this.path(), createMMSMessage, null, com.ringcentral.ContentType.MULTIPART)
258-
return com.ringcentral.Utils.gson.fromJson(rb.string(), com.ringcentral.definitions.GetMessageInfoResponse::class.java)
259-
}`)

0 commit comments

Comments
 (0)