diff --git a/api/openapi.yaml b/api/openapi.yaml index 076dddc..ddf22b0 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -40,18 +40,29 @@ paths: items: $ref: '#/components/schemas/Project' type: array + application/ld+json: + schema: + items: + $ref: '#/components/schemas/Project' + type: array description: Ok "415": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -74,18 +85,27 @@ paths: application/json: schema: $ref: '#/components/schemas/Project' + application/ld+json: + schema: + $ref: '#/components/schemas/Project' description: Created "415": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -113,6 +133,9 @@ paths: application/json: schema: $ref: '#/components/schemas/Project' + application/ld+json: + schema: + $ref: '#/components/schemas/Project' description: Ok "404": content: {} @@ -122,12 +145,18 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -170,6 +199,11 @@ paths: items: $ref: '#/components/schemas/Branch' type: array + application/ld+json: + schema: + items: + $ref: '#/components/schemas/Branch' + type: array description: Ok "404": content: {} @@ -179,12 +213,18 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -215,18 +255,27 @@ paths: application/json: schema: $ref: '#/components/schemas/Branch' + application/ld+json: + schema: + $ref: '#/components/schemas/Branch' description: Created "415": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -261,6 +310,9 @@ paths: application/json: schema: $ref: '#/components/schemas/Branch' + application/ld+json: + schema: + $ref: '#/components/schemas/Branch' description: Ok "404": content: {} @@ -270,12 +322,18 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -318,6 +376,11 @@ paths: items: $ref: '#/components/schemas/Commit' type: array + application/ld+json: + schema: + items: + $ref: '#/components/schemas/Commit' + type: array description: Ok "404": content: {} @@ -327,12 +390,18 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -369,18 +438,27 @@ paths: application/json: schema: $ref: '#/components/schemas/Commit' + application/ld+json: + schema: + $ref: '#/components/schemas/Commit' description: Created "415": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -415,6 +493,9 @@ paths: application/json: schema: $ref: '#/components/schemas/Commit' + application/ld+json: + schema: + $ref: '#/components/schemas/Commit' description: Ok "404": content: {} @@ -424,12 +505,18 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: The requested content type is not acceptable. "500": content: application/json: schema: $ref: '#/components/schemas/Error' + application/ld+json: + schema: + $ref: '#/components/schemas/Error' description: Internal server error. default: content: {} @@ -1121,11 +1208,14 @@ components: example: '@type': Project defaultBranch: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 name: name description: description - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: + '@id': + format: uuid + type: string '@type': enum: - Project @@ -1134,22 +1224,22 @@ components: $ref: '#/components/schemas/Project_defaultBranch' description: type: string - id: - format: uuid - type: string name: type: string type: object Branch: example: head: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 '@type': Branch name: name - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 owningProject: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: + '@id': + format: uuid + type: string '@type': enum: - Branch @@ -1158,9 +1248,6 @@ components: $ref: '#/components/schemas/Branch_head' owningProject: $ref: '#/components/schemas/Branch_owningProject' - id: - format: uuid - type: string name: type: string type: object @@ -1175,8 +1262,8 @@ components: '@type': ElementVersion identity: '@type': ElementIdentity - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - data: identifier: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 '@type': '@type' @@ -1184,14 +1271,17 @@ components: '@type': ElementVersion identity: '@type': ElementIdentity - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 previousCommit: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 owningProject: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: + '@id': + format: uuid + type: string '@type': enum: - Commit @@ -1202,9 +1292,6 @@ components: type: array owningProject: $ref: '#/components/schemas/Branch_owningProject' - id: - format: uuid - type: string previousCommit: $ref: '#/components/schemas/Branch_head' type: object @@ -1217,33 +1304,33 @@ components: '@type': ElementVersion identity: '@type': ElementIdentity - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: + '@id': + format: uuid + type: string '@type': enum: - ElementVersion type: string data: $ref: '#/components/schemas/Element' - id: - format: uuid - type: string identity: $ref: '#/components/schemas/ElementIdentity' type: object ElementIdentity: example: '@type': ElementIdentity - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: + '@id': + format: uuid + type: string '@type': enum: - ElementIdentity type: string - id: - format: uuid - type: string type: object Identified: example: @@ -1262,11 +1349,11 @@ components: '@type': '@type' '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: - '@type': - type: string '@id': format: uuid type: string + '@type': + type: string identifier: format: uuid type: string @@ -1283,11 +1370,11 @@ components: - '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: - '@type': - type: string '@id': format: uuid type: string + '@type': + type: string identifier: format: uuid type: string @@ -1308,24 +1395,24 @@ components: '@type': Query scope: - '@type': ElementIdentity - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 - '@type': ElementIdentity - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 where: '@type': PrimitiveConstraint - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 owningProject: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: + '@id': + format: uuid + type: string '@type': enum: - Query type: string owningProject: $ref: '#/components/schemas/Branch_owningProject' - id: - format: uuid - type: string scope: items: $ref: '#/components/schemas/ElementIdentity' @@ -1397,25 +1484,25 @@ components: Project_defaultBranch: description: Branch example: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: - id: + '@id': format: uuid type: string Branch_head: description: Commit example: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: - id: + '@id': format: uuid type: string Branch_owningProject: description: Project example: - id: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 + '@id': 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: - id: + '@id': format: uuid type: string diff --git a/build.gradle b/build.gradle index 1f394f0..52ca2df 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'eclipse' apply plugin: 'java' group = 'org.omg.sysml' -version = '2021-05' +version = '2021-06' buildscript { repositories { diff --git a/build.sbt b/build.sbt index 72e6f73..2e1da31 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "org.omg.sysml", name := "sysml-v2-api-client", - version := "2021-05", + version := "2021-06", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/docs/Branch.md b/docs/Branch.md index 266a001..f7f4fe3 100644 --- a/docs/Branch.md +++ b/docs/Branch.md @@ -6,10 +6,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**atId** | [**UUID**](UUID.md) | | [optional] **atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional] **head** | [**BranchHead**](BranchHead.md) | | [optional] **owningProject** | [**BranchOwningProject**](BranchOwningProject.md) | | [optional] -**id** | [**UUID**](UUID.md) | | [optional] **name** | **String** | | [optional] diff --git a/docs/BranchApi.md b/docs/BranchApi.md index d6724d0..acfa326 100644 --- a/docs/BranchApi.md +++ b/docs/BranchApi.md @@ -68,7 +68,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | @@ -134,7 +134,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | @@ -200,7 +200,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | diff --git a/docs/BranchHead.md b/docs/BranchHead.md index da5e22a..c29c133 100644 --- a/docs/BranchHead.md +++ b/docs/BranchHead.md @@ -7,7 +7,7 @@ Commit Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**id** | [**UUID**](UUID.md) | | [optional] +**atId** | [**UUID**](UUID.md) | | [optional] diff --git a/docs/BranchOwningProject.md b/docs/BranchOwningProject.md index 0429651..0868477 100644 --- a/docs/BranchOwningProject.md +++ b/docs/BranchOwningProject.md @@ -7,7 +7,7 @@ Project Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**id** | [**UUID**](UUID.md) | | [optional] +**atId** | [**UUID**](UUID.md) | | [optional] diff --git a/docs/Commit.md b/docs/Commit.md index 15dc78a..4417f05 100644 --- a/docs/Commit.md +++ b/docs/Commit.md @@ -6,10 +6,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**atId** | [**UUID**](UUID.md) | | [optional] **atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional] **change** | [**List<ElementVersion>**](ElementVersion.md) | | [optional] **owningProject** | [**BranchOwningProject**](BranchOwningProject.md) | | [optional] -**id** | [**UUID**](UUID.md) | | [optional] **previousCommit** | [**BranchHead**](BranchHead.md) | | [optional] diff --git a/docs/CommitApi.md b/docs/CommitApi.md index c5b107f..a5df8b0 100644 --- a/docs/CommitApi.md +++ b/docs/CommitApi.md @@ -64,7 +64,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | @@ -134,7 +134,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | @@ -202,7 +202,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | diff --git a/docs/Element.md b/docs/Element.md index 5454882..2094744 100644 --- a/docs/Element.md +++ b/docs/Element.md @@ -6,8 +6,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**atType** | **String** | | [optional] **atId** | [**UUID**](UUID.md) | | [optional] +**atType** | **String** | | [optional] **identifier** | [**UUID**](UUID.md) | | [optional] diff --git a/docs/ElementIdentity.md b/docs/ElementIdentity.md index 5eadd15..ccb7be1 100644 --- a/docs/ElementIdentity.md +++ b/docs/ElementIdentity.md @@ -6,8 +6,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**atId** | [**UUID**](UUID.md) | | [optional] **atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional] -**id** | [**UUID**](UUID.md) | | [optional] diff --git a/docs/ElementVersion.md b/docs/ElementVersion.md index f0e1980..ca3d1e5 100644 --- a/docs/ElementVersion.md +++ b/docs/ElementVersion.md @@ -6,9 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**atId** | [**UUID**](UUID.md) | | [optional] **atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional] **data** | [**Element**](Element.md) | | [optional] -**id** | [**UUID**](UUID.md) | | [optional] **identity** | [**ElementIdentity**](ElementIdentity.md) | | [optional] diff --git a/docs/Project.md b/docs/Project.md index 0311d45..1879864 100644 --- a/docs/Project.md +++ b/docs/Project.md @@ -6,10 +6,10 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**atId** | [**UUID**](UUID.md) | | [optional] **atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional] **defaultBranch** | [**ProjectDefaultBranch**](ProjectDefaultBranch.md) | | [optional] **description** | **String** | | [optional] -**id** | [**UUID**](UUID.md) | | [optional] **name** | **String** | | [optional] diff --git a/docs/ProjectApi.md b/docs/ProjectApi.md index 6188b3c..25e20d8 100644 --- a/docs/ProjectApi.md +++ b/docs/ProjectApi.md @@ -62,7 +62,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | @@ -130,7 +130,7 @@ No authorization required ### HTTP request headers - **Content-Type**: Not defined - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | @@ -193,7 +193,7 @@ No authorization required ### HTTP request headers - **Content-Type**: application/json - - **Accept**: application/json + - **Accept**: application/json, application/ld+json ### HTTP response details | Status code | Description | Response headers | diff --git a/docs/ProjectDefaultBranch.md b/docs/ProjectDefaultBranch.md index 4bb7931..07cb650 100644 --- a/docs/ProjectDefaultBranch.md +++ b/docs/ProjectDefaultBranch.md @@ -7,7 +7,7 @@ Branch Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**id** | [**UUID**](UUID.md) | | [optional] +**atId** | [**UUID**](UUID.md) | | [optional] diff --git a/docs/Query.md b/docs/Query.md index a6539a1..19ad4ff 100644 --- a/docs/Query.md +++ b/docs/Query.md @@ -6,9 +6,9 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**atId** | [**UUID**](UUID.md) | | [optional] **atType** | [**AtTypeEnum**](#AtTypeEnum) | | [optional] **owningProject** | [**BranchOwningProject**](BranchOwningProject.md) | | [optional] -**id** | [**UUID**](UUID.md) | | [optional] **scope** | [**List<ElementIdentity>**](ElementIdentity.md) | | [optional] **select** | **List<String>** | | [optional] **where** | [**Constraint**](Constraint.md) | | [optional] diff --git a/docs/Relationship.md b/docs/Relationship.md index 881567d..af12eee 100644 --- a/docs/Relationship.md +++ b/docs/Relationship.md @@ -6,8 +6,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**atType** | **String** | | [optional] **atId** | [**UUID**](UUID.md) | | [optional] +**atType** | **String** | | [optional] **identifier** | [**UUID**](UUID.md) | | [optional] **source** | [**List<Identified>**](Identified.md) | | [optional] **target** | [**List<Identified>**](Identified.md) | | [optional] diff --git a/pom.xml b/pom.xml index 3e1abbe..cb9009b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sysml-v2-api-client jar sysml-v2-api-client - 2021-05 + 2021-06 https://github.com/openapitools/openapi-generator OpenAPI Java diff --git a/src/main/java/org/omg/sysml/ApiClient.java b/src/main/java/org/omg/sysml/ApiClient.java index 9e9e2d4..eb5b6da 100644 --- a/src/main/java/org/omg/sysml/ApiClient.java +++ b/src/main/java/org/omg/sysml/ApiClient.java @@ -108,7 +108,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/2021-05/java"); + setUserAgent("OpenAPI-Generator/2021-06/java"); authentications = new HashMap(); } diff --git a/src/main/java/org/omg/sysml/api/BranchApi.java b/src/main/java/org/omg/sysml/api/BranchApi.java index 660efcc..c7e678a 100644 --- a/src/main/java/org/omg/sysml/api/BranchApi.java +++ b/src/main/java/org/omg/sysml/api/BranchApi.java @@ -100,7 +100,7 @@ public okhttp3.Call getBranchesByProjectCall(UUID projectId, String pageAfter, S Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { @@ -238,7 +238,7 @@ public okhttp3.Call getBranchesByProjectAndIdCall(UUID projectId, UUID branchId, Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { @@ -373,7 +373,7 @@ public okhttp3.Call postBranchByProjectCall(UUID projectId, Branch body, final A Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { diff --git a/src/main/java/org/omg/sysml/api/CommitApi.java b/src/main/java/org/omg/sysml/api/CommitApi.java index 2ac376e..ab7cb83 100644 --- a/src/main/java/org/omg/sysml/api/CommitApi.java +++ b/src/main/java/org/omg/sysml/api/CommitApi.java @@ -87,7 +87,7 @@ public okhttp3.Call getCommitByProjectAndIdCall(UUID projectId, UUID commitId, f Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { @@ -237,7 +237,7 @@ public okhttp3.Call getCommitsByProjectCall(UUID projectId, String pageAfter, St Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { @@ -378,7 +378,7 @@ public okhttp3.Call postCommitByProjectCall(UUID projectId, Commit body, UUID br Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { diff --git a/src/main/java/org/omg/sysml/api/ProjectApi.java b/src/main/java/org/omg/sysml/api/ProjectApi.java index a931761..2a061bb 100644 --- a/src/main/java/org/omg/sysml/api/ProjectApi.java +++ b/src/main/java/org/omg/sysml/api/ProjectApi.java @@ -85,7 +85,7 @@ public okhttp3.Call getProjectByIdCall(UUID projectId, final ApiCallback _callba Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { @@ -224,7 +224,7 @@ public okhttp3.Call getProjectsCall(String pageAfter, String pageBefore, Integer Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { @@ -347,7 +347,7 @@ public okhttp3.Call postProjectCall(Project body, final ApiCallback _callback) t Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); final String[] localVarAccepts = { - "application/json" + "application/json", "application/ld+json" }; final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); if (localVarAccept != null) { diff --git a/src/main/java/org/omg/sysml/model/Branch.java b/src/main/java/org/omg/sysml/model/Branch.java index 7324345..7bd782a 100644 --- a/src/main/java/org/omg/sysml/model/Branch.java +++ b/src/main/java/org/omg/sysml/model/Branch.java @@ -32,6 +32,10 @@ */ public class Branch { + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; + /** * Gets or Sets atType */ @@ -89,15 +93,34 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_OWNING_PROJECT) private BranchOwningProject owningProject; - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; - public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) private String name; + public Branch atId(UUID atId) { + + this.atId = atId; + return this; + } + + /** + * Get atId + * @return atId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public UUID getAtId() { + return atId; + } + + + public void setAtId(UUID atId) { + this.atId = atId; + } + + public Branch atType(AtTypeEnum atType) { this.atType = atType; @@ -167,29 +190,6 @@ public void setOwningProject(BranchOwningProject owningProject) { } - public Branch id(UUID id) { - - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @ApiModelProperty(value = "") - - public UUID getId() { - return id; - } - - - public void setId(UUID id) { - this.id = id; - } - - public Branch name(String name) { this.name = name; @@ -222,16 +222,16 @@ public boolean equals(java.lang.Object o) { return false; } Branch branch = (Branch) o; - return Objects.equals(this.atType, branch.atType) && + return Objects.equals(this.atId, branch.atId) && + Objects.equals(this.atType, branch.atType) && Objects.equals(this.head, branch.head) && Objects.equals(this.owningProject, branch.owningProject) && - Objects.equals(this.id, branch.id) && Objects.equals(this.name, branch.name); } @Override public int hashCode() { - return Objects.hash(atType, head, owningProject, id, name); + return Objects.hash(atId, atType, head, owningProject, name); } @@ -239,10 +239,10 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Branch {\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" head: ").append(toIndentedString(head)).append("\n"); sb.append(" owningProject: ").append(toIndentedString(owningProject)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/org/omg/sysml/model/BranchHead.java b/src/main/java/org/omg/sysml/model/BranchHead.java index 5676e85..f5af575 100644 --- a/src/main/java/org/omg/sysml/model/BranchHead.java +++ b/src/main/java/org/omg/sysml/model/BranchHead.java @@ -31,31 +31,31 @@ @ApiModel(description = "Commit") public class BranchHead { - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; - public BranchHead id(UUID id) { + public BranchHead atId(UUID atId) { - this.id = id; + this.atId = atId; return this; } /** - * Get id - * @return id + * Get atId + * @return atId **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public UUID getId() { - return id; + public UUID getAtId() { + return atId; } - public void setId(UUID id) { - this.id = id; + public void setAtId(UUID atId) { + this.atId = atId; } @@ -68,12 +68,12 @@ public boolean equals(java.lang.Object o) { return false; } BranchHead branchHead = (BranchHead) o; - return Objects.equals(this.id, branchHead.id); + return Objects.equals(this.atId, branchHead.atId); } @Override public int hashCode() { - return Objects.hash(id); + return Objects.hash(atId); } @@ -81,7 +81,7 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class BranchHead {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/org/omg/sysml/model/BranchOwningProject.java b/src/main/java/org/omg/sysml/model/BranchOwningProject.java index 76fe435..233fef4 100644 --- a/src/main/java/org/omg/sysml/model/BranchOwningProject.java +++ b/src/main/java/org/omg/sysml/model/BranchOwningProject.java @@ -31,31 +31,31 @@ @ApiModel(description = "Project") public class BranchOwningProject { - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; - public BranchOwningProject id(UUID id) { + public BranchOwningProject atId(UUID atId) { - this.id = id; + this.atId = atId; return this; } /** - * Get id - * @return id + * Get atId + * @return atId **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public UUID getId() { - return id; + public UUID getAtId() { + return atId; } - public void setId(UUID id) { - this.id = id; + public void setAtId(UUID atId) { + this.atId = atId; } @@ -68,12 +68,12 @@ public boolean equals(java.lang.Object o) { return false; } BranchOwningProject branchOwningProject = (BranchOwningProject) o; - return Objects.equals(this.id, branchOwningProject.id); + return Objects.equals(this.atId, branchOwningProject.atId); } @Override public int hashCode() { - return Objects.hash(id); + return Objects.hash(atId); } @@ -81,7 +81,7 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class BranchOwningProject {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/org/omg/sysml/model/Commit.java b/src/main/java/org/omg/sysml/model/Commit.java index 11d3d5a..e688eb6 100644 --- a/src/main/java/org/omg/sysml/model/Commit.java +++ b/src/main/java/org/omg/sysml/model/Commit.java @@ -35,6 +35,10 @@ */ public class Commit { + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; + /** * Gets or Sets atType */ @@ -92,15 +96,34 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_OWNING_PROJECT) private BranchOwningProject owningProject; - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; - public static final String SERIALIZED_NAME_PREVIOUS_COMMIT = "previousCommit"; @SerializedName(SERIALIZED_NAME_PREVIOUS_COMMIT) private BranchHead previousCommit; + public Commit atId(UUID atId) { + + this.atId = atId; + return this; + } + + /** + * Get atId + * @return atId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public UUID getAtId() { + return atId; + } + + + public void setAtId(UUID atId) { + this.atId = atId; + } + + public Commit atType(AtTypeEnum atType) { this.atType = atType; @@ -178,29 +201,6 @@ public void setOwningProject(BranchOwningProject owningProject) { } - public Commit id(UUID id) { - - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @ApiModelProperty(value = "") - - public UUID getId() { - return id; - } - - - public void setId(UUID id) { - this.id = id; - } - - public Commit previousCommit(BranchHead previousCommit) { this.previousCommit = previousCommit; @@ -233,16 +233,16 @@ public boolean equals(java.lang.Object o) { return false; } Commit commit = (Commit) o; - return Objects.equals(this.atType, commit.atType) && + return Objects.equals(this.atId, commit.atId) && + Objects.equals(this.atType, commit.atType) && Objects.equals(this.change, commit.change) && Objects.equals(this.owningProject, commit.owningProject) && - Objects.equals(this.id, commit.id) && Objects.equals(this.previousCommit, commit.previousCommit); } @Override public int hashCode() { - return Objects.hash(atType, change, owningProject, id, previousCommit); + return Objects.hash(atId, atType, change, owningProject, previousCommit); } @@ -250,10 +250,10 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Commit {\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" change: ").append(toIndentedString(change)).append("\n"); sb.append(" owningProject: ").append(toIndentedString(owningProject)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" previousCommit: ").append(toIndentedString(previousCommit)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/org/omg/sysml/model/Element.java b/src/main/java/org/omg/sysml/model/Element.java index 37cec65..d595057 100644 --- a/src/main/java/org/omg/sysml/model/Element.java +++ b/src/main/java/org/omg/sysml/model/Element.java @@ -32,62 +32,62 @@ */ public class Element extends HashMap { - public static final String SERIALIZED_NAME_AT_TYPE = "@type"; - @SerializedName(SERIALIZED_NAME_AT_TYPE) - private String atType; - public static final String SERIALIZED_NAME_AT_ID = "@id"; @SerializedName(SERIALIZED_NAME_AT_ID) private UUID atId; + public static final String SERIALIZED_NAME_AT_TYPE = "@type"; + @SerializedName(SERIALIZED_NAME_AT_TYPE) + private String atType; + public static final String SERIALIZED_NAME_IDENTIFIER = "identifier"; @SerializedName(SERIALIZED_NAME_IDENTIFIER) private UUID identifier; - public Element atType(String atType) { + public Element atId(UUID atId) { - this.atType = atType; + this.atId = atId; return this; } /** - * Get atType - * @return atType + * Get atId + * @return atId **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public String getAtType() { - return atType; + public UUID getAtId() { + return atId; } - public void setAtType(String atType) { - this.atType = atType; + public void setAtId(UUID atId) { + this.atId = atId; } - public Element atId(UUID atId) { + public Element atType(String atType) { - this.atId = atId; + this.atType = atType; return this; } /** - * Get atId - * @return atId + * Get atType + * @return atType **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public UUID getAtId() { - return atId; + public String getAtType() { + return atType; } - public void setAtId(UUID atId) { - this.atId = atId; + public void setAtType(String atType) { + this.atType = atType; } @@ -123,15 +123,15 @@ public boolean equals(java.lang.Object o) { return false; } Element element = (Element) o; - return Objects.equals(this.atType, element.atType) && - Objects.equals(this.atId, element.atId) && + return Objects.equals(this.atId, element.atId) && + Objects.equals(this.atType, element.atType) && Objects.equals(this.identifier, element.identifier) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(atType, atId, identifier, super.hashCode()); + return Objects.hash(atId, atType, identifier, super.hashCode()); } @@ -140,8 +140,8 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Element {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); + sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" identifier: ").append(toIndentedString(identifier)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/org/omg/sysml/model/ElementIdentity.java b/src/main/java/org/omg/sysml/model/ElementIdentity.java index 7ef4977..90e5d53 100644 --- a/src/main/java/org/omg/sysml/model/ElementIdentity.java +++ b/src/main/java/org/omg/sysml/model/ElementIdentity.java @@ -30,6 +30,10 @@ */ public class ElementIdentity { + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; + /** * Gets or Sets atType */ @@ -79,54 +83,50 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_AT_TYPE) private AtTypeEnum atType; - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; - - public ElementIdentity atType(AtTypeEnum atType) { + public ElementIdentity atId(UUID atId) { - this.atType = atType; + this.atId = atId; return this; } /** - * Get atType - * @return atType + * Get atId + * @return atId **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public AtTypeEnum getAtType() { - return atType; + public UUID getAtId() { + return atId; } - public void setAtType(AtTypeEnum atType) { - this.atType = atType; + public void setAtId(UUID atId) { + this.atId = atId; } - public ElementIdentity id(UUID id) { + public ElementIdentity atType(AtTypeEnum atType) { - this.id = id; + this.atType = atType; return this; } /** - * Get id - * @return id + * Get atType + * @return atType **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public UUID getId() { - return id; + public AtTypeEnum getAtType() { + return atType; } - public void setId(UUID id) { - this.id = id; + public void setAtType(AtTypeEnum atType) { + this.atType = atType; } @@ -139,13 +139,13 @@ public boolean equals(java.lang.Object o) { return false; } ElementIdentity elementIdentity = (ElementIdentity) o; - return Objects.equals(this.atType, elementIdentity.atType) && - Objects.equals(this.id, elementIdentity.id); + return Objects.equals(this.atId, elementIdentity.atId) && + Objects.equals(this.atType, elementIdentity.atType); } @Override public int hashCode() { - return Objects.hash(atType, id); + return Objects.hash(atId, atType); } @@ -153,8 +153,8 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ElementIdentity {\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/org/omg/sysml/model/ElementVersion.java b/src/main/java/org/omg/sysml/model/ElementVersion.java index aeaaafe..d84fa12 100644 --- a/src/main/java/org/omg/sysml/model/ElementVersion.java +++ b/src/main/java/org/omg/sysml/model/ElementVersion.java @@ -32,6 +32,10 @@ */ public class ElementVersion { + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; + /** * Gets or Sets atType */ @@ -85,15 +89,34 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_DATA) private Element data; - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; - public static final String SERIALIZED_NAME_IDENTITY = "identity"; @SerializedName(SERIALIZED_NAME_IDENTITY) private ElementIdentity identity; + public ElementVersion atId(UUID atId) { + + this.atId = atId; + return this; + } + + /** + * Get atId + * @return atId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public UUID getAtId() { + return atId; + } + + + public void setAtId(UUID atId) { + this.atId = atId; + } + + public ElementVersion atType(AtTypeEnum atType) { this.atType = atType; @@ -140,29 +163,6 @@ public void setData(Element data) { } - public ElementVersion id(UUID id) { - - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @ApiModelProperty(value = "") - - public UUID getId() { - return id; - } - - - public void setId(UUID id) { - this.id = id; - } - - public ElementVersion identity(ElementIdentity identity) { this.identity = identity; @@ -195,15 +195,15 @@ public boolean equals(java.lang.Object o) { return false; } ElementVersion elementVersion = (ElementVersion) o; - return Objects.equals(this.atType, elementVersion.atType) && + return Objects.equals(this.atId, elementVersion.atId) && + Objects.equals(this.atType, elementVersion.atType) && Objects.equals(this.data, elementVersion.data) && - Objects.equals(this.id, elementVersion.id) && Objects.equals(this.identity, elementVersion.identity); } @Override public int hashCode() { - return Objects.hash(atType, data, id, identity); + return Objects.hash(atId, atType, data, identity); } @@ -211,9 +211,9 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ElementVersion {\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" identity: ").append(toIndentedString(identity)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/org/omg/sysml/model/Project.java b/src/main/java/org/omg/sysml/model/Project.java index 2533768..908a795 100644 --- a/src/main/java/org/omg/sysml/model/Project.java +++ b/src/main/java/org/omg/sysml/model/Project.java @@ -31,6 +31,10 @@ */ public class Project { + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; + /** * Gets or Sets atType */ @@ -88,15 +92,34 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_DESCRIPTION) private String description; - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; - public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) private String name; + public Project atId(UUID atId) { + + this.atId = atId; + return this; + } + + /** + * Get atId + * @return atId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public UUID getAtId() { + return atId; + } + + + public void setAtId(UUID atId) { + this.atId = atId; + } + + public Project atType(AtTypeEnum atType) { this.atType = atType; @@ -166,29 +189,6 @@ public void setDescription(String description) { } - public Project id(UUID id) { - - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @ApiModelProperty(value = "") - - public UUID getId() { - return id; - } - - - public void setId(UUID id) { - this.id = id; - } - - public Project name(String name) { this.name = name; @@ -221,16 +221,16 @@ public boolean equals(java.lang.Object o) { return false; } Project project = (Project) o; - return Objects.equals(this.atType, project.atType) && + return Objects.equals(this.atId, project.atId) && + Objects.equals(this.atType, project.atType) && Objects.equals(this.defaultBranch, project.defaultBranch) && Objects.equals(this.description, project.description) && - Objects.equals(this.id, project.id) && Objects.equals(this.name, project.name); } @Override public int hashCode() { - return Objects.hash(atType, defaultBranch, description, id, name); + return Objects.hash(atId, atType, defaultBranch, description, name); } @@ -238,10 +238,10 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Project {\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" defaultBranch: ").append(toIndentedString(defaultBranch)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/org/omg/sysml/model/ProjectDefaultBranch.java b/src/main/java/org/omg/sysml/model/ProjectDefaultBranch.java index f7d0cf9..1a7505c 100644 --- a/src/main/java/org/omg/sysml/model/ProjectDefaultBranch.java +++ b/src/main/java/org/omg/sysml/model/ProjectDefaultBranch.java @@ -31,31 +31,31 @@ @ApiModel(description = "Branch") public class ProjectDefaultBranch { - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; - public ProjectDefaultBranch id(UUID id) { + public ProjectDefaultBranch atId(UUID atId) { - this.id = id; + this.atId = atId; return this; } /** - * Get id - * @return id + * Get atId + * @return atId **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public UUID getId() { - return id; + public UUID getAtId() { + return atId; } - public void setId(UUID id) { - this.id = id; + public void setAtId(UUID atId) { + this.atId = atId; } @@ -68,12 +68,12 @@ public boolean equals(java.lang.Object o) { return false; } ProjectDefaultBranch projectDefaultBranch = (ProjectDefaultBranch) o; - return Objects.equals(this.id, projectDefaultBranch.id); + return Objects.equals(this.atId, projectDefaultBranch.atId); } @Override public int hashCode() { - return Objects.hash(id); + return Objects.hash(atId); } @@ -81,7 +81,7 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ProjectDefaultBranch {\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/org/omg/sysml/model/Query.java b/src/main/java/org/omg/sysml/model/Query.java index 466edaf..a1754c0 100644 --- a/src/main/java/org/omg/sysml/model/Query.java +++ b/src/main/java/org/omg/sysml/model/Query.java @@ -35,6 +35,10 @@ */ public class Query { + public static final String SERIALIZED_NAME_AT_ID = "@id"; + @SerializedName(SERIALIZED_NAME_AT_ID) + private UUID atId; + /** * Gets or Sets atType */ @@ -88,10 +92,6 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_OWNING_PROJECT) private BranchOwningProject owningProject; - public static final String SERIALIZED_NAME_ID = "id"; - @SerializedName(SERIALIZED_NAME_ID) - private UUID id; - public static final String SERIALIZED_NAME_SCOPE = "scope"; @SerializedName(SERIALIZED_NAME_SCOPE) private List scope = null; @@ -105,6 +105,29 @@ public AtTypeEnum read(final JsonReader jsonReader) throws IOException { private Constraint where; + public Query atId(UUID atId) { + + this.atId = atId; + return this; + } + + /** + * Get atId + * @return atId + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public UUID getAtId() { + return atId; + } + + + public void setAtId(UUID atId) { + this.atId = atId; + } + + public Query atType(AtTypeEnum atType) { this.atType = atType; @@ -151,29 +174,6 @@ public void setOwningProject(BranchOwningProject owningProject) { } - public Query id(UUID id) { - - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @ApiModelProperty(value = "") - - public UUID getId() { - return id; - } - - - public void setId(UUID id) { - this.id = id; - } - - public Query scope(List scope) { this.scope = scope; @@ -268,9 +268,9 @@ public boolean equals(java.lang.Object o) { return false; } Query query = (Query) o; - return Objects.equals(this.atType, query.atType) && + return Objects.equals(this.atId, query.atId) && + Objects.equals(this.atType, query.atType) && Objects.equals(this.owningProject, query.owningProject) && - Objects.equals(this.id, query.id) && Objects.equals(this.scope, query.scope) && Objects.equals(this.select, query.select) && Objects.equals(this.where, query.where); @@ -278,7 +278,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(atType, owningProject, id, scope, select, where); + return Objects.hash(atId, atType, owningProject, scope, select, where); } @@ -286,9 +286,9 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Query {\n"); + sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" owningProject: ").append(toIndentedString(owningProject)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" scope: ").append(toIndentedString(scope)).append("\n"); sb.append(" select: ").append(toIndentedString(select)).append("\n"); sb.append(" where: ").append(toIndentedString(where)).append("\n"); diff --git a/src/main/java/org/omg/sysml/model/Relationship.java b/src/main/java/org/omg/sysml/model/Relationship.java index 4c5fde7..a044a80 100644 --- a/src/main/java/org/omg/sysml/model/Relationship.java +++ b/src/main/java/org/omg/sysml/model/Relationship.java @@ -33,14 +33,14 @@ */ public class Relationship { - public static final String SERIALIZED_NAME_AT_TYPE = "@type"; - @SerializedName(SERIALIZED_NAME_AT_TYPE) - private String atType; - public static final String SERIALIZED_NAME_AT_ID = "@id"; @SerializedName(SERIALIZED_NAME_AT_ID) private UUID atId; + public static final String SERIALIZED_NAME_AT_TYPE = "@type"; + @SerializedName(SERIALIZED_NAME_AT_TYPE) + private String atType; + public static final String SERIALIZED_NAME_IDENTIFIER = "identifier"; @SerializedName(SERIALIZED_NAME_IDENTIFIER) private UUID identifier; @@ -54,49 +54,49 @@ public class Relationship { private List target = null; - public Relationship atType(String atType) { + public Relationship atId(UUID atId) { - this.atType = atType; + this.atId = atId; return this; } /** - * Get atType - * @return atType + * Get atId + * @return atId **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public String getAtType() { - return atType; + public UUID getAtId() { + return atId; } - public void setAtType(String atType) { - this.atType = atType; + public void setAtId(UUID atId) { + this.atId = atId; } - public Relationship atId(UUID atId) { + public Relationship atType(String atType) { - this.atId = atId; + this.atType = atType; return this; } /** - * Get atId - * @return atId + * Get atType + * @return atType **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public UUID getAtId() { - return atId; + public String getAtType() { + return atType; } - public void setAtId(UUID atId) { - this.atId = atId; + public void setAtType(String atType) { + this.atType = atType; } @@ -194,8 +194,8 @@ public boolean equals(java.lang.Object o) { return false; } Relationship relationship = (Relationship) o; - return Objects.equals(this.atType, relationship.atType) && - Objects.equals(this.atId, relationship.atId) && + return Objects.equals(this.atId, relationship.atId) && + Objects.equals(this.atType, relationship.atType) && Objects.equals(this.identifier, relationship.identifier) && Objects.equals(this.source, relationship.source) && Objects.equals(this.target, relationship.target); @@ -203,7 +203,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(atType, atId, identifier, source, target); + return Objects.hash(atId, atType, identifier, source, target); } @@ -211,8 +211,8 @@ public int hashCode() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Relationship {\n"); - sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" atId: ").append(toIndentedString(atId)).append("\n"); + sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); sb.append(" identifier: ").append(toIndentedString(identifier)).append("\n"); sb.append(" source: ").append(toIndentedString(source)).append("\n"); sb.append(" target: ").append(toIndentedString(target)).append("\n"); diff --git a/src/test/java/org/omg/sysml/model/BranchHeadTest.java b/src/test/java/org/omg/sysml/model/BranchHeadTest.java index b5308de..039e504 100644 --- a/src/test/java/org/omg/sysml/model/BranchHeadTest.java +++ b/src/test/java/org/omg/sysml/model/BranchHeadTest.java @@ -42,11 +42,11 @@ public void testBranchHead() { } /** - * Test the property 'id' + * Test the property 'atId' */ @Test - public void idTest() { - // TODO: test id + public void atIdTest() { + // TODO: test atId } } diff --git a/src/test/java/org/omg/sysml/model/BranchOwningProjectTest.java b/src/test/java/org/omg/sysml/model/BranchOwningProjectTest.java index 4c9e691..79b5517 100644 --- a/src/test/java/org/omg/sysml/model/BranchOwningProjectTest.java +++ b/src/test/java/org/omg/sysml/model/BranchOwningProjectTest.java @@ -42,11 +42,11 @@ public void testBranchOwningProject() { } /** - * Test the property 'id' + * Test the property 'atId' */ @Test - public void idTest() { - // TODO: test id + public void atIdTest() { + // TODO: test atId } } diff --git a/src/test/java/org/omg/sysml/model/BranchTest.java b/src/test/java/org/omg/sysml/model/BranchTest.java index f1d8a63..035d194 100644 --- a/src/test/java/org/omg/sysml/model/BranchTest.java +++ b/src/test/java/org/omg/sysml/model/BranchTest.java @@ -43,6 +43,14 @@ public void testBranch() { // TODO: test Branch } + /** + * Test the property 'atId' + */ + @Test + public void atIdTest() { + // TODO: test atId + } + /** * Test the property 'atType' */ @@ -67,14 +75,6 @@ public void owningProjectTest() { // TODO: test owningProject } - /** - * Test the property 'id' - */ - @Test - public void idTest() { - // TODO: test id - } - /** * Test the property 'name' */ diff --git a/src/test/java/org/omg/sysml/model/CommitTest.java b/src/test/java/org/omg/sysml/model/CommitTest.java index 518df28..2e243bd 100644 --- a/src/test/java/org/omg/sysml/model/CommitTest.java +++ b/src/test/java/org/omg/sysml/model/CommitTest.java @@ -46,6 +46,14 @@ public void testCommit() { // TODO: test Commit } + /** + * Test the property 'atId' + */ + @Test + public void atIdTest() { + // TODO: test atId + } + /** * Test the property 'atType' */ @@ -70,14 +78,6 @@ public void owningProjectTest() { // TODO: test owningProject } - /** - * Test the property 'id' - */ - @Test - public void idTest() { - // TODO: test id - } - /** * Test the property 'previousCommit' */ diff --git a/src/test/java/org/omg/sysml/model/ElementIdentityTest.java b/src/test/java/org/omg/sysml/model/ElementIdentityTest.java index 879ba77..6553801 100644 --- a/src/test/java/org/omg/sysml/model/ElementIdentityTest.java +++ b/src/test/java/org/omg/sysml/model/ElementIdentityTest.java @@ -42,19 +42,19 @@ public void testElementIdentity() { } /** - * Test the property 'atType' + * Test the property 'atId' */ @Test - public void atTypeTest() { - // TODO: test atType + public void atIdTest() { + // TODO: test atId } /** - * Test the property 'id' + * Test the property 'atType' */ @Test - public void idTest() { - // TODO: test id + public void atTypeTest() { + // TODO: test atType } } diff --git a/src/test/java/org/omg/sysml/model/ElementTest.java b/src/test/java/org/omg/sysml/model/ElementTest.java index cfb0c62..fa89ef4 100644 --- a/src/test/java/org/omg/sysml/model/ElementTest.java +++ b/src/test/java/org/omg/sysml/model/ElementTest.java @@ -44,19 +44,19 @@ public void testElement() { } /** - * Test the property 'atType' + * Test the property 'atId' */ @Test - public void atTypeTest() { - // TODO: test atType + public void atIdTest() { + // TODO: test atId } /** - * Test the property 'atId' + * Test the property 'atType' */ @Test - public void atIdTest() { - // TODO: test atId + public void atTypeTest() { + // TODO: test atType } /** diff --git a/src/test/java/org/omg/sysml/model/ElementVersionTest.java b/src/test/java/org/omg/sysml/model/ElementVersionTest.java index b5e8d8b..1662ab1 100644 --- a/src/test/java/org/omg/sysml/model/ElementVersionTest.java +++ b/src/test/java/org/omg/sysml/model/ElementVersionTest.java @@ -43,6 +43,14 @@ public void testElementVersion() { // TODO: test ElementVersion } + /** + * Test the property 'atId' + */ + @Test + public void atIdTest() { + // TODO: test atId + } + /** * Test the property 'atType' */ @@ -59,14 +67,6 @@ public void dataTest() { // TODO: test data } - /** - * Test the property 'id' - */ - @Test - public void idTest() { - // TODO: test id - } - /** * Test the property 'identity' */ diff --git a/src/test/java/org/omg/sysml/model/ProjectDefaultBranchTest.java b/src/test/java/org/omg/sysml/model/ProjectDefaultBranchTest.java index a56eb8c..1044d69 100644 --- a/src/test/java/org/omg/sysml/model/ProjectDefaultBranchTest.java +++ b/src/test/java/org/omg/sysml/model/ProjectDefaultBranchTest.java @@ -42,11 +42,11 @@ public void testProjectDefaultBranch() { } /** - * Test the property 'id' + * Test the property 'atId' */ @Test - public void idTest() { - // TODO: test id + public void atIdTest() { + // TODO: test atId } } diff --git a/src/test/java/org/omg/sysml/model/ProjectTest.java b/src/test/java/org/omg/sysml/model/ProjectTest.java index 011ab2f..3cabaeb 100644 --- a/src/test/java/org/omg/sysml/model/ProjectTest.java +++ b/src/test/java/org/omg/sysml/model/ProjectTest.java @@ -42,6 +42,14 @@ public void testProject() { // TODO: test Project } + /** + * Test the property 'atId' + */ + @Test + public void atIdTest() { + // TODO: test atId + } + /** * Test the property 'atType' */ @@ -66,14 +74,6 @@ public void descriptionTest() { // TODO: test description } - /** - * Test the property 'id' - */ - @Test - public void idTest() { - // TODO: test id - } - /** * Test the property 'name' */ diff --git a/src/test/java/org/omg/sysml/model/QueryTest.java b/src/test/java/org/omg/sysml/model/QueryTest.java index c143803..0b9207c 100644 --- a/src/test/java/org/omg/sysml/model/QueryTest.java +++ b/src/test/java/org/omg/sysml/model/QueryTest.java @@ -46,6 +46,14 @@ public void testQuery() { // TODO: test Query } + /** + * Test the property 'atId' + */ + @Test + public void atIdTest() { + // TODO: test atId + } + /** * Test the property 'atType' */ @@ -62,14 +70,6 @@ public void owningProjectTest() { // TODO: test owningProject } - /** - * Test the property 'id' - */ - @Test - public void idTest() { - // TODO: test id - } - /** * Test the property 'scope' */ diff --git a/src/test/java/org/omg/sysml/model/RelationshipTest.java b/src/test/java/org/omg/sysml/model/RelationshipTest.java index 6f9f758..9ce675e 100644 --- a/src/test/java/org/omg/sysml/model/RelationshipTest.java +++ b/src/test/java/org/omg/sysml/model/RelationshipTest.java @@ -45,19 +45,19 @@ public void testRelationship() { } /** - * Test the property 'atType' + * Test the property 'atId' */ @Test - public void atTypeTest() { - // TODO: test atType + public void atIdTest() { + // TODO: test atId } /** - * Test the property 'atId' + * Test the property 'atType' */ @Test - public void atIdTest() { - // TODO: test atId + public void atTypeTest() { + // TODO: test atType } /**