Skip to content

Commit 11aa39b

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'release/2021-04' into develop
2 parents b8f057c + 434dd95 commit 11aa39b

26 files changed

+1433
-332
lines changed

‎api/openapi.yaml

+174-34
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ servers:
77
- url: /
88
tags:
99
- name: Project
10+
- name: Branch
1011
- name: Commit
1112
- name: Element
1213
- name: Relationship
@@ -135,9 +136,9 @@ paths:
135136
tags:
136137
- Project
137138
x-accepts: application/json
138-
/projects/{projectId}/commits:
139+
/projects/{projectId}/branches:
139140
get:
140-
operationId: getCommitsByProject
141+
operationId: getBranchesByProject
141142
parameters:
142143
- description: ID of the project
143144
in: path
@@ -167,7 +168,7 @@ paths:
167168
application/json:
168169
schema:
169170
items:
170-
$ref: '#/components/schemas/Commit'
171+
$ref: '#/components/schemas/Branch'
171172
type: array
172173
description: Ok
173174
"404":
@@ -188,12 +189,12 @@ paths:
188189
default:
189190
content: {}
190191
description: Unexpected response.
191-
summary: Get commits by project
192+
summary: Get branches by project
192193
tags:
193-
- Commit
194+
- Branch
194195
x-accepts: application/json
195196
post:
196-
operationId: postCommitByProject
197+
operationId: postBranchByProject
197198
parameters:
198199
- description: ID of the project
199200
in: path
@@ -206,14 +207,14 @@ paths:
206207
content:
207208
application/json:
208209
schema:
209-
$ref: '#/components/schemas/Commit'
210+
$ref: '#/components/schemas/Branch'
210211
required: true
211212
responses:
212213
"201":
213214
content:
214215
application/json:
215216
schema:
216-
$ref: '#/components/schemas/Commit'
217+
$ref: '#/components/schemas/Branch'
217218
description: Created
218219
"415":
219220
content:
@@ -230,15 +231,15 @@ paths:
230231
default:
231232
content: {}
232233
description: Unexpected response.
233-
summary: Create commit by project
234+
summary: Create branch by project
234235
tags:
235-
- Commit
236+
- Branch
236237
x-codegen-request-body-name: body
237238
x-contentType: application/json
238239
x-accepts: application/json
239-
/projects/{projectId}/commits/{commitId}:
240+
/projects/{projectId}/branches/{branchId}:
240241
get:
241-
operationId: getCommitByProjectAndId
242+
operationId: getBranchesByProjectAndId
242243
parameters:
243244
- description: ID of the project
244245
in: path
@@ -247,9 +248,9 @@ paths:
247248
schema:
248249
format: uuid
249250
type: string
250-
- description: ID of the commit
251+
- description: ID of the branch
251252
in: path
252-
name: commitId
253+
name: branchId
253254
required: true
254255
schema:
255256
format: uuid
@@ -259,7 +260,7 @@ paths:
259260
content:
260261
application/json:
261262
schema:
262-
$ref: '#/components/schemas/Commit'
263+
$ref: '#/components/schemas/Branch'
263264
description: Ok
264265
"404":
265266
content: {}
@@ -279,13 +280,120 @@ paths:
279280
default:
280281
content: {}
281282
description: Unexpected response.
282-
summary: Get commit by project and ID
283+
summary: Get branch by project and ID
284+
tags:
285+
- Branch
286+
x-accepts: application/json
287+
/projects/{projectId}/commits:
288+
get:
289+
operationId: getCommitsByProject
290+
parameters:
291+
- description: ID of the project
292+
in: path
293+
name: projectId
294+
required: true
295+
schema:
296+
format: uuid
297+
type: string
298+
- description: Page after
299+
in: query
300+
name: page[after]
301+
schema:
302+
type: string
303+
- description: Page before
304+
in: query
305+
name: page[before]
306+
schema:
307+
type: string
308+
- description: Page size
309+
in: query
310+
name: page[size]
311+
schema:
312+
type: integer
313+
responses:
314+
"200":
315+
content:
316+
application/json:
317+
schema:
318+
items:
319+
$ref: '#/components/schemas/Commit'
320+
type: array
321+
description: Ok
322+
"404":
323+
content: {}
324+
description: Not found.
325+
"415":
326+
content:
327+
application/json:
328+
schema:
329+
$ref: '#/components/schemas/Error'
330+
description: The requested content type is not acceptable.
331+
"500":
332+
content:
333+
application/json:
334+
schema:
335+
$ref: '#/components/schemas/Error'
336+
description: Internal server error.
337+
default:
338+
content: {}
339+
description: Unexpected response.
340+
summary: Get commits by project
341+
tags:
342+
- Commit
343+
x-accepts: application/json
344+
post:
345+
operationId: postCommitByProject
346+
parameters:
347+
- description: ID of the project
348+
in: path
349+
name: projectId
350+
required: true
351+
schema:
352+
format: uuid
353+
type: string
354+
- description: ID of the branch - project's default branch if unspecified
355+
in: query
356+
name: branchId
357+
schema:
358+
format: uuid
359+
type: string
360+
requestBody:
361+
content:
362+
application/json:
363+
schema:
364+
$ref: '#/components/schemas/Commit'
365+
required: true
366+
responses:
367+
"201":
368+
content:
369+
application/json:
370+
schema:
371+
$ref: '#/components/schemas/Commit'
372+
description: Created
373+
"415":
374+
content:
375+
application/json:
376+
schema:
377+
$ref: '#/components/schemas/Error'
378+
description: The requested content type is not acceptable.
379+
"500":
380+
content:
381+
application/json:
382+
schema:
383+
$ref: '#/components/schemas/Error'
384+
description: Internal server error.
385+
default:
386+
content: {}
387+
description: Unexpected response.
388+
summary: Create commit by project
283389
tags:
284390
- Commit
391+
x-codegen-request-body-name: body
392+
x-contentType: application/json
285393
x-accepts: application/json
286-
/projects/{projectId}/head:
394+
/projects/{projectId}/commits/{commitId}:
287395
get:
288-
operationId: getHeadCommitByProject
396+
operationId: getCommitByProjectAndId
289397
parameters:
290398
- description: ID of the project
291399
in: path
@@ -294,6 +402,13 @@ paths:
294402
schema:
295403
format: uuid
296404
type: string
405+
- description: ID of the commit
406+
in: path
407+
name: commitId
408+
required: true
409+
schema:
410+
format: uuid
411+
type: string
297412
responses:
298413
"200":
299414
content:
@@ -319,7 +434,7 @@ paths:
319434
default:
320435
content: {}
321436
description: Unexpected response.
322-
summary: Get head commit by project
437+
summary: Get commit by project and ID
323438
tags:
324439
- Commit
325440
x-accepts: application/json
@@ -1002,27 +1117,43 @@ components:
10021117
content: {}
10031118
description: Ok
10041119
schemas:
1005-
Record:
1120+
Project:
10061121
example:
1122+
'@type': Project
1123+
name: name
1124+
description: description
10071125
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
10081126
properties:
1127+
'@type':
1128+
enum:
1129+
- Project
1130+
type: string
1131+
description:
1132+
type: string
10091133
id:
10101134
format: uuid
10111135
type: string
1136+
name:
1137+
type: string
10121138
type: object
1013-
Project:
1139+
Branch:
10141140
example:
1015-
'@type': Project
1141+
head:
1142+
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
1143+
'@type': Branch
10161144
name: name
1017-
description: description
10181145
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
1146+
owningProject:
1147+
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
10191148
properties:
10201149
'@type':
10211150
enum:
1022-
- Project
1023-
type: string
1024-
description:
1151+
- Branch
10251152
type: string
1153+
head:
1154+
$ref: '#/components/schemas/Branch_head'
1155+
owningProject:
1156+
$ref: '#/components/schemas/Branch_owningProject'
10261157
id:
10271158
format: uuid
10281159
type: string
@@ -1054,7 +1185,7 @@ components:
10541185
previousCommit:
10551186
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
10561187
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
1057-
containingProject:
1188+
owningProject:
10581189
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
10591190
properties:
10601191
'@type':
@@ -1065,13 +1196,13 @@ components:
10651196
items:
10661197
$ref: '#/components/schemas/ElementVersion'
10671198
type: array
1068-
containingProject:
1069-
$ref: '#/components/schemas/Commit_containingProject'
1199+
owningProject:
1200+
$ref: '#/components/schemas/Branch_owningProject'
10701201
id:
10711202
format: uuid
10721203
type: string
10731204
previousCommit:
1074-
$ref: '#/components/schemas/Record'
1205+
$ref: '#/components/schemas/Branch_head'
10751206
type: object
10761207
ElementVersion:
10771208
example:
@@ -1179,15 +1310,15 @@ components:
11791310
where:
11801311
'@type': PrimitiveConstraint
11811312
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
1182-
containingProject:
1313+
owningProject:
11831314
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
11841315
properties:
11851316
'@type':
11861317
enum:
11871318
- Query
11881319
type: string
1189-
containingProject:
1190-
$ref: '#/components/schemas/Commit_containingProject'
1320+
owningProject:
1321+
$ref: '#/components/schemas/Branch_owningProject'
11911322
id:
11921323
format: uuid
11931324
type: string
@@ -1259,7 +1390,16 @@ components:
12591390
error:
12601391
type: string
12611392
type: object
1262-
Commit_containingProject:
1393+
Branch_head:
1394+
description: Commit
1395+
example:
1396+
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
1397+
properties:
1398+
id:
1399+
format: uuid
1400+
type: string
1401+
Branch_owningProject:
1402+
description: Project
12631403
example:
12641404
id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
12651405
properties:

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
33
apply plugin: 'java'
44

55
group = 'org.omg.sysml'
6-
version = '2021-03'
6+
version = '2021-04'
77

88
buildscript {
99
repositories {

‎build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "org.omg.sysml",
44
name := "sysml-v2-api-client",
5-
version := "2021-03",
5+
version := "2021-04",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

0 commit comments

Comments
 (0)