diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 5c98b42..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 4274503..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -sysml-v2-api-client \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index cae81d0..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index efa4625..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 25d34a4..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/sbt.xml b/.idea/sbt.xml deleted file mode 100644 index 2018743..0000000 --- a/.idea/sbt.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index a16267e..41bea3d 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Add this dependency to your project's POM: org.omg.sysml sysml-v2-api-client - 2020-03 + 2020-03-p1 compile ``` @@ -49,7 +49,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "org.omg.sysml:sysml-v2-api-client:2020-03" +compile "org.omg.sysml:sysml-v2-api-client:2020-03-p1" ``` ### Others @@ -62,7 +62,7 @@ mvn clean package Then manually install the following JARs: -* `target/sysml-v2-api-client-2020-03.jar` +* `target/sysml-v2-api-client-2020-03-p1.jar` * `target/lib/*.jar` ## Getting Started @@ -84,8 +84,8 @@ public class Example { defaultClient.setBasePath("http://localhost"); CommitApi apiInstance = new CommitApi(defaultClient); - String projectId = "projectId_example"; // String | ID of the project - String commitId = "commitId_example"; // String | ID of the commit + UUID projectId = new UUID(); // UUID | ID of the project + UUID commitId = new UUID(); // UUID | ID of the commit try { Commit result = apiInstance.getCommitByProjectAndId(projectId, commitId); System.out.println(result); diff --git a/build.gradle b/build.gradle index cd24037..ea7bc18 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'eclipse' apply plugin: 'java' group = 'org.omg.sysml' -version = '2020-03' +version = '2020-03-p1' buildscript { repositories { diff --git a/build.sbt b/build.sbt index 429c195..41c7aca 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 := "2020-03", + version := "2020-03-p1", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/docs/CommitApi.md b/docs/CommitApi.md index 1f7913f..98945bb 100644 --- a/docs/CommitApi.md +++ b/docs/CommitApi.md @@ -31,8 +31,8 @@ public class Example { defaultClient.setBasePath("http://localhost"); CommitApi apiInstance = new CommitApi(defaultClient); - String projectId = "projectId_example"; // String | ID of the project - String commitId = "commitId_example"; // String | ID of the commit + UUID projectId = new UUID(); // UUID | ID of the project + UUID commitId = new UUID(); // UUID | ID of the commit try { Commit result = apiInstance.getCommitByProjectAndId(projectId, commitId); System.out.println(result); @@ -51,8 +51,8 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **projectId** | **String**| ID of the project | - **commitId** | **String**| ID of the commit | + **projectId** | [**UUID**](.md)| ID of the project | + **commitId** | [**UUID**](.md)| ID of the commit | ### Return type @@ -78,7 +78,7 @@ No authorization required # **getCommitsByProject** -> Commit getCommitsByProject(projectId) +> List<Commit> getCommitsByProject(projectId) Get commits by project @@ -99,7 +99,7 @@ public class Example { CommitApi apiInstance = new CommitApi(defaultClient); UUID projectId = new UUID(); // UUID | ID of the project try { - Commit result = apiInstance.getCommitsByProject(projectId); + List result = apiInstance.getCommitsByProject(projectId); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling CommitApi#getCommitsByProject"); @@ -120,7 +120,7 @@ Name | Type | Description | Notes ### Return type -[**Commit**](Commit.md) +[**List<Commit>**](Commit.md) ### Authorization @@ -161,7 +161,7 @@ public class Example { defaultClient.setBasePath("http://localhost"); CommitApi apiInstance = new CommitApi(defaultClient); - String projectId = "projectId_example"; // String | ID of the project + UUID projectId = new UUID(); // UUID | ID of the project try { Commit result = apiInstance.getHeadCommitByProject(projectId); System.out.println(result); @@ -180,7 +180,7 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **projectId** | **String**| ID of the project | + **projectId** | [**UUID**](.md)| ID of the project | ### Return type diff --git a/docs/ElementApi.md b/docs/ElementApi.md index 963a554..2fef447 100644 --- a/docs/ElementApi.md +++ b/docs/ElementApi.md @@ -78,7 +78,7 @@ No authorization required # **getElementsByProjectCommit** -> Element getElementsByProjectCommit(projectId, commitId) +> List<Element> getElementsByProjectCommit(projectId, commitId) Get elements by project and commit @@ -100,7 +100,7 @@ public class Example { UUID projectId = new UUID(); // UUID | ID of the project UUID commitId = new UUID(); // UUID | ID of the commit try { - Element result = apiInstance.getElementsByProjectCommit(projectId, commitId); + List result = apiInstance.getElementsByProjectCommit(projectId, commitId); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ElementApi#getElementsByProjectCommit"); @@ -122,7 +122,7 @@ Name | Type | Description | Notes ### Return type -[**Element**](Element.md) +[**List<Element>**](Element.md) ### Authorization diff --git a/pom.xml b/pom.xml index 52253ef..cacb956 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sysml-v2-api-client jar sysml-v2-api-client - 2020-03 + 2020-03-p1 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 a4e44cd..931ec94 100644 --- a/src/main/java/org/omg/sysml/ApiClient.java +++ b/src/main/java/org/omg/sysml/ApiClient.java @@ -97,7 +97,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/2020-03/java"); + setUserAgent("OpenAPI-Generator/2020-03-p1/java"); authentications = new HashMap(); } diff --git a/src/main/java/org/omg/sysml/api/CommitApi.java b/src/main/java/org/omg/sysml/api/CommitApi.java index a18bb81..74b6d8d 100644 --- a/src/main/java/org/omg/sysml/api/CommitApi.java +++ b/src/main/java/org/omg/sysml/api/CommitApi.java @@ -73,7 +73,7 @@ public void setApiClient(ApiClient apiClient) { 0 Unexpected response. - */ - public okhttp3.Call getCommitByProjectAndIdCall(String projectId, String commitId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getCommitByProjectAndIdCall(UUID projectId, UUID commitId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -105,7 +105,7 @@ public okhttp3.Call getCommitByProjectAndIdCall(String projectId, String commitI } @SuppressWarnings("rawtypes") - private okhttp3.Call getCommitByProjectAndIdValidateBeforeCall(String projectId, String commitId, final ApiCallback _callback) throws ApiException { + private okhttp3.Call getCommitByProjectAndIdValidateBeforeCall(UUID projectId, UUID commitId, final ApiCallback _callback) throws ApiException { // verify the required parameter 'projectId' is set if (projectId == null) { @@ -140,7 +140,7 @@ private okhttp3.Call getCommitByProjectAndIdValidateBeforeCall(String projectId, 0 Unexpected response. - */ - public Commit getCommitByProjectAndId(String projectId, String commitId) throws ApiException { + public Commit getCommitByProjectAndId(UUID projectId, UUID commitId) throws ApiException { ApiResponse localVarResp = getCommitByProjectAndIdWithHttpInfo(projectId, commitId); return localVarResp.getData(); } @@ -162,7 +162,7 @@ public Commit getCommitByProjectAndId(String projectId, String commitId) throws 0 Unexpected response. - */ - public ApiResponse getCommitByProjectAndIdWithHttpInfo(String projectId, String commitId) throws ApiException { + public ApiResponse getCommitByProjectAndIdWithHttpInfo(UUID projectId, UUID commitId) throws ApiException { okhttp3.Call localVarCall = getCommitByProjectAndIdValidateBeforeCall(projectId, commitId, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); @@ -186,7 +186,7 @@ public ApiResponse getCommitByProjectAndIdWithHttpInfo(String projectId, 0 Unexpected response. - */ - public okhttp3.Call getCommitByProjectAndIdAsync(String projectId, String commitId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getCommitByProjectAndIdAsync(UUID projectId, UUID commitId, final ApiCallback _callback) throws ApiException { okhttp3.Call localVarCall = getCommitByProjectAndIdValidateBeforeCall(projectId, commitId, _callback); Type localVarReturnType = new TypeToken(){}.getType(); @@ -257,7 +257,7 @@ private okhttp3.Call getCommitsByProjectValidateBeforeCall(UUID projectId, final * Get commits by project * * @param projectId ID of the project (required) - * @return Commit + * @return List<Commit> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -269,8 +269,8 @@ private okhttp3.Call getCommitsByProjectValidateBeforeCall(UUID projectId, final
0 Unexpected response. -
*/ - public Commit getCommitsByProject(UUID projectId) throws ApiException { - ApiResponse localVarResp = getCommitsByProjectWithHttpInfo(projectId); + public List getCommitsByProject(UUID projectId) throws ApiException { + ApiResponse> localVarResp = getCommitsByProjectWithHttpInfo(projectId); return localVarResp.getData(); } @@ -278,7 +278,7 @@ public Commit getCommitsByProject(UUID projectId) throws ApiException { * Get commits by project * * @param projectId ID of the project (required) - * @return ApiResponse<Commit> + * @return ApiResponse<List<Commit>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -290,9 +290,9 @@ public Commit getCommitsByProject(UUID projectId) throws ApiException {
0 Unexpected response. -
*/ - public ApiResponse getCommitsByProjectWithHttpInfo(UUID projectId) throws ApiException { + public ApiResponse> getCommitsByProjectWithHttpInfo(UUID projectId) throws ApiException { okhttp3.Call localVarCall = getCommitsByProjectValidateBeforeCall(projectId, null); - Type localVarReturnType = new TypeToken(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -313,10 +313,10 @@ public ApiResponse getCommitsByProjectWithHttpInfo(UUID projectId) throw 0 Unexpected response. - */ - public okhttp3.Call getCommitsByProjectAsync(UUID projectId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getCommitsByProjectAsync(UUID projectId, final ApiCallback> _callback) throws ApiException { okhttp3.Call localVarCall = getCommitsByProjectValidateBeforeCall(projectId, _callback); - Type localVarReturnType = new TypeToken(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } @@ -336,7 +336,7 @@ public okhttp3.Call getCommitsByProjectAsync(UUID projectId, final ApiCallback 0 Unexpected response. - */ - public okhttp3.Call getHeadCommitByProjectCall(String projectId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getHeadCommitByProjectCall(UUID projectId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -367,7 +367,7 @@ public okhttp3.Call getHeadCommitByProjectCall(String projectId, final ApiCallba } @SuppressWarnings("rawtypes") - private okhttp3.Call getHeadCommitByProjectValidateBeforeCall(String projectId, final ApiCallback _callback) throws ApiException { + private okhttp3.Call getHeadCommitByProjectValidateBeforeCall(UUID projectId, final ApiCallback _callback) throws ApiException { // verify the required parameter 'projectId' is set if (projectId == null) { @@ -396,7 +396,7 @@ private okhttp3.Call getHeadCommitByProjectValidateBeforeCall(String projectId, 0 Unexpected response. - */ - public Commit getHeadCommitByProject(String projectId) throws ApiException { + public Commit getHeadCommitByProject(UUID projectId) throws ApiException { ApiResponse localVarResp = getHeadCommitByProjectWithHttpInfo(projectId); return localVarResp.getData(); } @@ -417,7 +417,7 @@ public Commit getHeadCommitByProject(String projectId) throws ApiException { 0 Unexpected response. - */ - public ApiResponse getHeadCommitByProjectWithHttpInfo(String projectId) throws ApiException { + public ApiResponse getHeadCommitByProjectWithHttpInfo(UUID projectId) throws ApiException { okhttp3.Call localVarCall = getHeadCommitByProjectValidateBeforeCall(projectId, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); @@ -440,7 +440,7 @@ public ApiResponse getHeadCommitByProjectWithHttpInfo(String projectId) 0 Unexpected response. - */ - public okhttp3.Call getHeadCommitByProjectAsync(String projectId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getHeadCommitByProjectAsync(UUID projectId, final ApiCallback _callback) throws ApiException { okhttp3.Call localVarCall = getHeadCommitByProjectValidateBeforeCall(projectId, _callback); Type localVarReturnType = new TypeToken(){}.getType(); diff --git a/src/main/java/org/omg/sysml/api/ElementApi.java b/src/main/java/org/omg/sysml/api/ElementApi.java index 51f28a5..8ce9b29 100644 --- a/src/main/java/org/omg/sysml/api/ElementApi.java +++ b/src/main/java/org/omg/sysml/api/ElementApi.java @@ -275,7 +275,7 @@ private okhttp3.Call getElementsByProjectCommitValidateBeforeCall(UUID projectId * * @param projectId ID of the project (required) * @param commitId ID of the commit (required) - * @return Element + * @return List<Element> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -287,8 +287,8 @@ private okhttp3.Call getElementsByProjectCommitValidateBeforeCall(UUID projectId
0 Unexpected response. -
*/ - public Element getElementsByProjectCommit(UUID projectId, UUID commitId) throws ApiException { - ApiResponse localVarResp = getElementsByProjectCommitWithHttpInfo(projectId, commitId); + public List getElementsByProjectCommit(UUID projectId, UUID commitId) throws ApiException { + ApiResponse> localVarResp = getElementsByProjectCommitWithHttpInfo(projectId, commitId); return localVarResp.getData(); } @@ -297,7 +297,7 @@ public Element getElementsByProjectCommit(UUID projectId, UUID commitId) throws * * @param projectId ID of the project (required) * @param commitId ID of the commit (required) - * @return ApiResponse<Element> + * @return ApiResponse<List<Element>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -309,9 +309,9 @@ public Element getElementsByProjectCommit(UUID projectId, UUID commitId) throws
0 Unexpected response. -
*/ - public ApiResponse getElementsByProjectCommitWithHttpInfo(UUID projectId, UUID commitId) throws ApiException { + public ApiResponse> getElementsByProjectCommitWithHttpInfo(UUID projectId, UUID commitId) throws ApiException { okhttp3.Call localVarCall = getElementsByProjectCommitValidateBeforeCall(projectId, commitId, null); - Type localVarReturnType = new TypeToken(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -333,10 +333,10 @@ public ApiResponse getElementsByProjectCommitWithHttpInfo(UUID projectI 0 Unexpected response. - */ - public okhttp3.Call getElementsByProjectCommitAsync(UUID projectId, UUID commitId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getElementsByProjectCommitAsync(UUID projectId, UUID commitId, final ApiCallback> _callback) throws ApiException { okhttp3.Call localVarCall = getElementsByProjectCommitValidateBeforeCall(projectId, commitId, _callback); - Type localVarReturnType = new TypeToken(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } diff --git a/src/test/java/org/omg/sysml/api/CommitApiTest.java b/src/test/java/org/omg/sysml/api/CommitApiTest.java index fe12c94..ccee30b 100644 --- a/src/test/java/org/omg/sysml/api/CommitApiTest.java +++ b/src/test/java/org/omg/sysml/api/CommitApiTest.java @@ -44,8 +44,8 @@ public class CommitApiTest { */ @Test public void getCommitByProjectAndIdTest() throws ApiException { - String projectId = null; - String commitId = null; + UUID projectId = null; + UUID commitId = null; Commit response = api.getCommitByProjectAndId(projectId, commitId); // TODO: test validations @@ -62,7 +62,7 @@ public void getCommitByProjectAndIdTest() throws ApiException { @Test public void getCommitsByProjectTest() throws ApiException { UUID projectId = null; - Commit response = api.getCommitsByProject(projectId); + List response = api.getCommitsByProject(projectId); // TODO: test validations } @@ -77,7 +77,7 @@ public void getCommitsByProjectTest() throws ApiException { */ @Test public void getHeadCommitByProjectTest() throws ApiException { - String projectId = null; + UUID projectId = null; Commit response = api.getHeadCommitByProject(projectId); // TODO: test validations diff --git a/src/test/java/org/omg/sysml/api/ElementApiTest.java b/src/test/java/org/omg/sysml/api/ElementApiTest.java index 4fa4b72..695af2b 100644 --- a/src/test/java/org/omg/sysml/api/ElementApiTest.java +++ b/src/test/java/org/omg/sysml/api/ElementApiTest.java @@ -64,7 +64,7 @@ public void getElementByProjectCommitIdTest() throws ApiException { public void getElementsByProjectCommitTest() throws ApiException { UUID projectId = null; UUID commitId = null; - Element response = api.getElementsByProjectCommit(projectId, commitId); + List response = api.getElementsByProjectCommit(projectId, commitId); // TODO: test validations }