diff --git a/.sdk-version b/.sdk-version index 0d06862..9526e67 100644 --- a/.sdk-version +++ b/.sdk-version @@ -1 +1 @@ -v2.70.0 +v2.74.0 diff --git a/README.md b/README.md index 52cff0d..c11b9eb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add this dependency to your project's POM: ai.reveng sdk - 2.70.0 + 2.74.0 compile ``` @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation "ai.reveng:sdk:2.70.0" + implementation "ai.reveng:sdk:2.74.0" } ``` @@ -252,8 +252,8 @@ Class | Method | HTTP request | Description - [BaseResponseGenerationStatusList](docs/BaseResponseGenerationStatusList.md) - [BaseResponseGetAiDecompilationRatingResponse](docs/BaseResponseGetAiDecompilationRatingResponse.md) - [BaseResponseGetAiDecompilationTask](docs/BaseResponseGetAiDecompilationTask.md) + - [BaseResponseGetMeResponse](docs/BaseResponseGetMeResponse.md) - [BaseResponseGetPublicUserResponse](docs/BaseResponseGetPublicUserResponse.md) - - [BaseResponseGetUserResponse](docs/BaseResponseGetUserResponse.md) - [BaseResponseListCollectionResults](docs/BaseResponseListCollectionResults.md) - [BaseResponseListCommentResponse](docs/BaseResponseListCommentResponse.md) - [BaseResponseListDieMatch](docs/BaseResponseListDieMatch.md) @@ -380,8 +380,8 @@ Class | Method | HTTP request | Description - [GenerationStatusList](docs/GenerationStatusList.md) - [GetAiDecompilationRatingResponse](docs/GetAiDecompilationRatingResponse.md) - [GetAiDecompilationTask](docs/GetAiDecompilationTask.md) + - [GetMeResponse](docs/GetMeResponse.md) - [GetPublicUserResponse](docs/GetPublicUserResponse.md) - - [GetUserResponse](docs/GetUserResponse.md) - [GlobalVariable](docs/GlobalVariable.md) - [ISA](docs/ISA.md) - [IconModel](docs/IconModel.md) diff --git a/build.gradle b/build.gradle index 88e3204..4a5e63c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'ai.reveng' -version = '2.70.0' +version = '2.74.0' @@ -171,7 +171,7 @@ mavenPublishing { publishToMavenCentral(true) signAllPublications() - coordinates("ai.reveng", "sdk", "2.70.0") + coordinates("ai.reveng", "sdk", "2.74.0") pom { name = "sdk" diff --git a/build.sbt b/build.sbt index a40bd55..72116c5 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "ai.reveng", name := "sdk", - version := "2.70.0", + version := "2.74.0", scalaVersion := "2.11.12", scalacOptions ++= Seq("-feature"), compile / javacOptions ++= Seq("-Xlint:deprecation"), diff --git a/docs/AnalysisFunctionMatchingRequest.md b/docs/AnalysisFunctionMatchingRequest.md index 370516b..33fd715 100644 --- a/docs/AnalysisFunctionMatchingRequest.md +++ b/docs/AnalysisFunctionMatchingRequest.md @@ -14,6 +14,7 @@ |**pageSize** | **Integer** | Number of functions to return per page, default is 0 (all functions), max is 1000 | [optional] | |**statusOnly** | **Boolean** | If set to true, only returns the status of the matching operation without the actual results | [optional] | |**noCache** | **Boolean** | If set to true, forces the system to bypass any cached results and perform a fresh computation | [optional] | +|**useCanonicalNames** | **Boolean** | Whether to use canonical function names during function matching for confidence results, default is False | [optional] | diff --git a/docs/AuthenticationUsersApi.md b/docs/AuthenticationUsersApi.md index b96164e..6deed1a 100644 --- a/docs/AuthenticationUsersApi.md +++ b/docs/AuthenticationUsersApi.md @@ -13,7 +13,7 @@ All URIs are relative to *https://api.reveng.ai* # **getRequesterUserInfo** -> BaseResponseGetUserResponse getRequesterUserInfo() +> BaseResponseGetMeResponse getRequesterUserInfo() Get the requesters user information @@ -40,7 +40,7 @@ public class Example { AuthenticationUsersApi apiInstance = new AuthenticationUsersApi(defaultClient); try { - BaseResponseGetUserResponse result = apiInstance.getRequesterUserInfo(); + BaseResponseGetMeResponse result = apiInstance.getRequesterUserInfo(); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling AuthenticationUsersApi#getRequesterUserInfo"); @@ -58,7 +58,7 @@ This endpoint does not need any parameter. ### Return type -[**BaseResponseGetUserResponse**](BaseResponseGetUserResponse.md) +[**BaseResponseGetMeResponse**](BaseResponseGetMeResponse.md) ### Authorization diff --git a/docs/AutoUnstripRequest.md b/docs/AutoUnstripRequest.md index 4dd084a..0a4160a 100644 --- a/docs/AutoUnstripRequest.md +++ b/docs/AutoUnstripRequest.md @@ -13,6 +13,7 @@ |**minGroupSize** | **Integer** | Minimum number of matching functions required to consider for a match, default is 10 | [optional] | |**statusOnly** | **Boolean** | If set to true, only returns the status of the auto-unstrip operation without the actual results | [optional] | |**noCache** | **Boolean** | If set to true, forces the system to bypass any cached results and perform a fresh computation | [optional] | +|**useCanonicalNames** | **Boolean** | Whether to use canonical function names during matching for auto-unstrip, default is False | [optional] | diff --git a/docs/BaseResponseGetUserResponse.md b/docs/BaseResponseGetMeResponse.md similarity index 79% rename from docs/BaseResponseGetUserResponse.md rename to docs/BaseResponseGetMeResponse.md index 5998902..fa43951 100644 --- a/docs/BaseResponseGetUserResponse.md +++ b/docs/BaseResponseGetMeResponse.md @@ -1,6 +1,6 @@ -# BaseResponseGetUserResponse +# BaseResponseGetMeResponse ## Properties @@ -8,7 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**status** | **Boolean** | Response status on whether the request succeeded | [optional] | -|**data** | [**GetUserResponse**](GetUserResponse.md) | | [optional] | +|**data** | [**GetMeResponse**](GetMeResponse.md) | | [optional] | |**message** | **String** | | [optional] | |**errors** | [**List<ErrorModel>**](ErrorModel.md) | | [optional] | |**meta** | [**MetaModel**](MetaModel.md) | Metadata | [optional] | diff --git a/docs/FunctionMatchingRequest.md b/docs/FunctionMatchingRequest.md index ec53763..45c0acb 100644 --- a/docs/FunctionMatchingRequest.md +++ b/docs/FunctionMatchingRequest.md @@ -16,6 +16,7 @@ |**pageSize** | **Integer** | Number of functions to return per page, default is 0 (all functions), max is 1000 | [optional] | |**statusOnly** | **Boolean** | If set to true, only returns the status of the matching operation without the actual results | [optional] | |**noCache** | **Boolean** | If set to true, forces the system to bypass any cached results and perform a fresh computation | [optional] | +|**useCanonicalNames** | **Boolean** | Whether to use canonical function names during function matching for confidence results, default is False | [optional] | diff --git a/docs/GetUserResponse.md b/docs/GetMeResponse.md similarity index 60% rename from docs/GetUserResponse.md rename to docs/GetMeResponse.md index a129185..2412e86 100644 --- a/docs/GetUserResponse.md +++ b/docs/GetMeResponse.md @@ -1,6 +1,6 @@ -# GetUserResponse +# GetMeResponse ## Properties @@ -14,6 +14,18 @@ |**email** | **String** | | | |**creation** | **OffsetDateTime** | | | |**tutorialSeen** | **Boolean** | | | +|**role** | [**RoleEnum**](#RoleEnum) | | | + + + +## Enum: RoleEnum + +| Name | Value | +|---- | -----| +| USER | "USER" | +| ADMIN | "ADMIN" | +| SUPERADMIN | "SUPERADMIN" | +| SYSTEM | "SYSTEM" | diff --git a/pom.xml b/pom.xml index 03d488d..0d165a7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sdk jar sdk - 2.70.0 + 2.74.0 https://github.com/RevEngAI/sdk-java Java SDK for the RevEng.AI API diff --git a/src/main/java/ai/reveng/api/AuthenticationUsersApi.java b/src/main/java/ai/reveng/api/AuthenticationUsersApi.java index 31ddc2c..cf15e5e 100644 --- a/src/main/java/ai/reveng/api/AuthenticationUsersApi.java +++ b/src/main/java/ai/reveng/api/AuthenticationUsersApi.java @@ -27,8 +27,8 @@ import ai.reveng.model.BaseResponse; +import ai.reveng.model.BaseResponseGetMeResponse; import ai.reveng.model.BaseResponseGetPublicUserResponse; -import ai.reveng.model.BaseResponseGetUserResponse; import ai.reveng.model.BaseResponseListCommentResponse; import ai.reveng.model.BaseResponseListUserActivityResponse; import ai.reveng.model.BaseResponseLoginResponse; @@ -143,7 +143,7 @@ private okhttp3.Call getRequesterUserInfoValidateBeforeCall(final ApiCallback _c /** * Get the requesters user information * - * @return BaseResponseGetUserResponse + * @return BaseResponseGetMeResponse * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -153,15 +153,15 @@ private okhttp3.Call getRequesterUserInfoValidateBeforeCall(final ApiCallback _c
422 Invalid request parameters -
*/ - public BaseResponseGetUserResponse getRequesterUserInfo() throws ApiException { - ApiResponse localVarResp = getRequesterUserInfoWithHttpInfo(); + public BaseResponseGetMeResponse getRequesterUserInfo() throws ApiException { + ApiResponse localVarResp = getRequesterUserInfoWithHttpInfo(); return localVarResp.getData(); } /** * Get the requesters user information * - * @return ApiResponse<BaseResponseGetUserResponse> + * @return ApiResponse<BaseResponseGetMeResponse> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -171,9 +171,9 @@ public BaseResponseGetUserResponse getRequesterUserInfo() throws ApiException {
422 Invalid request parameters -
*/ - public ApiResponse getRequesterUserInfoWithHttpInfo() throws ApiException { + public ApiResponse getRequesterUserInfoWithHttpInfo() throws ApiException { okhttp3.Call localVarCall = getRequesterUserInfoValidateBeforeCall(null); - Type localVarReturnType = new TypeToken(){}.getType(); + Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -191,10 +191,10 @@ public ApiResponse getRequesterUserInfoWithHttpInfo 422 Invalid request parameters - */ - public okhttp3.Call getRequesterUserInfoAsync(final ApiCallback _callback) throws ApiException { + public okhttp3.Call getRequesterUserInfoAsync(final ApiCallback _callback) throws ApiException { okhttp3.Call localVarCall = getRequesterUserInfoValidateBeforeCall(_callback); - Type localVarReturnType = new TypeToken(){}.getType(); + Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } diff --git a/src/main/java/ai/reveng/invoker/ApiClient.java b/src/main/java/ai/reveng/invoker/ApiClient.java index b2cc1c2..fb31ff4 100644 --- a/src/main/java/ai/reveng/invoker/ApiClient.java +++ b/src/main/java/ai/reveng/invoker/ApiClient.java @@ -146,7 +146,7 @@ protected void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/2.70.0/java"); + setUserAgent("OpenAPI-Generator/2.74.0/java"); authentications = new HashMap(); } diff --git a/src/main/java/ai/reveng/invoker/Configuration.java b/src/main/java/ai/reveng/invoker/Configuration.java index ffca577..a645d4c 100644 --- a/src/main/java/ai/reveng/invoker/Configuration.java +++ b/src/main/java/ai/reveng/invoker/Configuration.java @@ -18,7 +18,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class Configuration { - public static final String VERSION = "2.70.0"; + public static final String VERSION = "2.74.0"; private static final AtomicReference defaultApiClient = new AtomicReference<>(); private static volatile Supplier apiClientFactory = ApiClient::new; diff --git a/src/main/java/ai/reveng/invoker/JSON.java b/src/main/java/ai/reveng/invoker/JSON.java index e81876d..0bdc64f 100644 --- a/src/main/java/ai/reveng/invoker/JSON.java +++ b/src/main/java/ai/reveng/invoker/JSON.java @@ -164,8 +164,8 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseGenerationStatusList.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseGetAiDecompilationRatingResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseGetAiDecompilationTask.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseGetMeResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseGetPublicUserResponse.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseGetUserResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseListCollectionResults.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseListCommentResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.BaseResponseListDieMatch.CustomTypeAdapterFactory()); @@ -284,8 +284,8 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GenerationStatusList.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GetAiDecompilationRatingResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GetAiDecompilationTask.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GetMeResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GetPublicUserResponse.CustomTypeAdapterFactory()); - gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GetUserResponse.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.GlobalVariable.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.IconModel.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.ImportModel.CustomTypeAdapterFactory()); diff --git a/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java b/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java index 661b681..38a5812 100644 --- a/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java +++ b/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java @@ -92,6 +92,12 @@ public class AnalysisFunctionMatchingRequest { @javax.annotation.Nullable private Boolean noCache = false; + public static final String SERIALIZED_NAME_USE_CANONICAL_NAMES = "use_canonical_names"; + @Deprecated + @SerializedName(SERIALIZED_NAME_USE_CANONICAL_NAMES) + @javax.annotation.Nullable + private Boolean useCanonicalNames = false; + public AnalysisFunctionMatchingRequest() { } @@ -246,6 +252,29 @@ public void setNoCache(@javax.annotation.Nullable Boolean noCache) { this.noCache = noCache; } + + @Deprecated + public AnalysisFunctionMatchingRequest useCanonicalNames(@javax.annotation.Nullable Boolean useCanonicalNames) { + this.useCanonicalNames = useCanonicalNames; + return this; + } + + /** + * Whether to use canonical function names during function matching for confidence results, default is False + * @return useCanonicalNames + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + public Boolean getUseCanonicalNames() { + return useCanonicalNames; + } + + @Deprecated + public void setUseCanonicalNames(@javax.annotation.Nullable Boolean useCanonicalNames) { + this.useCanonicalNames = useCanonicalNames; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -307,7 +336,8 @@ public boolean equals(Object o) { Objects.equals(this.page, analysisFunctionMatchingRequest.page) && Objects.equals(this.pageSize, analysisFunctionMatchingRequest.pageSize) && Objects.equals(this.statusOnly, analysisFunctionMatchingRequest.statusOnly) && - Objects.equals(this.noCache, analysisFunctionMatchingRequest.noCache)&& + Objects.equals(this.noCache, analysisFunctionMatchingRequest.noCache) && + Objects.equals(this.useCanonicalNames, analysisFunctionMatchingRequest.useCanonicalNames)&& Objects.equals(this.additionalProperties, analysisFunctionMatchingRequest.additionalProperties); } @@ -317,7 +347,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(minSimilarity, filters, resultsPerFunction, page, pageSize, statusOnly, noCache, additionalProperties); + return Objects.hash(minSimilarity, filters, resultsPerFunction, page, pageSize, statusOnly, noCache, useCanonicalNames, additionalProperties); } private static int hashCodeNullable(JsonNullable a) { @@ -338,6 +368,7 @@ public String toString() { sb.append(" pageSize: ").append(toIndentedString(pageSize)).append("\n"); sb.append(" statusOnly: ").append(toIndentedString(statusOnly)).append("\n"); sb.append(" noCache: ").append(toIndentedString(noCache)).append("\n"); + sb.append(" useCanonicalNames: ").append(toIndentedString(useCanonicalNames)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -360,7 +391,7 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("min_similarity", "filters", "results_per_function", "page", "page_size", "status_only", "no_cache")); + openapiFields = new HashSet(Arrays.asList("min_similarity", "filters", "results_per_function", "page", "page_size", "status_only", "no_cache", "use_canonical_names")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(0); diff --git a/src/main/java/ai/reveng/model/AutoUnstripRequest.java b/src/main/java/ai/reveng/model/AutoUnstripRequest.java index 008e73f..b50899b 100644 --- a/src/main/java/ai/reveng/model/AutoUnstripRequest.java +++ b/src/main/java/ai/reveng/model/AutoUnstripRequest.java @@ -88,6 +88,12 @@ public class AutoUnstripRequest { @javax.annotation.Nullable private Boolean noCache = false; + public static final String SERIALIZED_NAME_USE_CANONICAL_NAMES = "use_canonical_names"; + @Deprecated + @SerializedName(SERIALIZED_NAME_USE_CANONICAL_NAMES) + @javax.annotation.Nullable + private Boolean useCanonicalNames = false; + public AutoUnstripRequest() { } @@ -234,6 +240,29 @@ public void setNoCache(@javax.annotation.Nullable Boolean noCache) { this.noCache = noCache; } + + @Deprecated + public AutoUnstripRequest useCanonicalNames(@javax.annotation.Nullable Boolean useCanonicalNames) { + this.useCanonicalNames = useCanonicalNames; + return this; + } + + /** + * Whether to use canonical function names during matching for auto-unstrip, default is False + * @return useCanonicalNames + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + public Boolean getUseCanonicalNames() { + return useCanonicalNames; + } + + @Deprecated + public void setUseCanonicalNames(@javax.annotation.Nullable Boolean useCanonicalNames) { + this.useCanonicalNames = useCanonicalNames; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -294,13 +323,14 @@ public boolean equals(Object o) { Objects.equals(this.confidenceThreshold, autoUnstripRequest.confidenceThreshold) && Objects.equals(this.minGroupSize, autoUnstripRequest.minGroupSize) && Objects.equals(this.statusOnly, autoUnstripRequest.statusOnly) && - Objects.equals(this.noCache, autoUnstripRequest.noCache)&& + Objects.equals(this.noCache, autoUnstripRequest.noCache) && + Objects.equals(this.useCanonicalNames, autoUnstripRequest.useCanonicalNames)&& Objects.equals(this.additionalProperties, autoUnstripRequest.additionalProperties); } @Override public int hashCode() { - return Objects.hash(minSimilarity, apply, confidenceThreshold, minGroupSize, statusOnly, noCache, additionalProperties); + return Objects.hash(minSimilarity, apply, confidenceThreshold, minGroupSize, statusOnly, noCache, useCanonicalNames, additionalProperties); } @Override @@ -313,6 +343,7 @@ public String toString() { sb.append(" minGroupSize: ").append(toIndentedString(minGroupSize)).append("\n"); sb.append(" statusOnly: ").append(toIndentedString(statusOnly)).append("\n"); sb.append(" noCache: ").append(toIndentedString(noCache)).append("\n"); + sb.append(" useCanonicalNames: ").append(toIndentedString(useCanonicalNames)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -335,7 +366,7 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("min_similarity", "apply", "confidence_threshold", "min_group_size", "status_only", "no_cache")); + openapiFields = new HashSet(Arrays.asList("min_similarity", "apply", "confidence_threshold", "min_group_size", "status_only", "no_cache", "use_canonical_names")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(0); diff --git a/src/main/java/ai/reveng/model/BaseResponseGetUserResponse.java b/src/main/java/ai/reveng/model/BaseResponseGetMeResponse.java similarity index 81% rename from src/main/java/ai/reveng/model/BaseResponseGetUserResponse.java rename to src/main/java/ai/reveng/model/BaseResponseGetMeResponse.java index ee3cf3b..48c8383 100644 --- a/src/main/java/ai/reveng/model/BaseResponseGetUserResponse.java +++ b/src/main/java/ai/reveng/model/BaseResponseGetMeResponse.java @@ -15,7 +15,7 @@ import java.util.Objects; import java.util.Locale; import ai.reveng.model.ErrorModel; -import ai.reveng.model.GetUserResponse; +import ai.reveng.model.GetMeResponse; import ai.reveng.model.MetaModel; import com.google.gson.TypeAdapter; import com.google.gson.annotations.JsonAdapter; @@ -53,10 +53,10 @@ import ai.reveng.invoker.JSON; /** - * BaseResponseGetUserResponse + * BaseResponseGetMeResponse */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class BaseResponseGetUserResponse { +public class BaseResponseGetMeResponse { public static final String SERIALIZED_NAME_STATUS = "status"; @SerializedName(SERIALIZED_NAME_STATUS) @javax.annotation.Nullable @@ -65,7 +65,7 @@ public class BaseResponseGetUserResponse { public static final String SERIALIZED_NAME_DATA = "data"; @SerializedName(SERIALIZED_NAME_DATA) @javax.annotation.Nullable - private GetUserResponse data; + private GetMeResponse data; public static final String SERIALIZED_NAME_MESSAGE = "message"; @SerializedName(SERIALIZED_NAME_MESSAGE) @@ -82,10 +82,10 @@ public class BaseResponseGetUserResponse { @javax.annotation.Nullable private MetaModel meta; - public BaseResponseGetUserResponse() { + public BaseResponseGetMeResponse() { } - public BaseResponseGetUserResponse status(@javax.annotation.Nullable Boolean status) { + public BaseResponseGetMeResponse status(@javax.annotation.Nullable Boolean status) { this.status = status; return this; } @@ -104,7 +104,7 @@ public void setStatus(@javax.annotation.Nullable Boolean status) { } - public BaseResponseGetUserResponse data(@javax.annotation.Nullable GetUserResponse data) { + public BaseResponseGetMeResponse data(@javax.annotation.Nullable GetMeResponse data) { this.data = data; return this; } @@ -114,16 +114,16 @@ public BaseResponseGetUserResponse data(@javax.annotation.Nullable GetUserRespon * @return data */ @javax.annotation.Nullable - public GetUserResponse getData() { + public GetMeResponse getData() { return data; } - public void setData(@javax.annotation.Nullable GetUserResponse data) { + public void setData(@javax.annotation.Nullable GetMeResponse data) { this.data = data; } - public BaseResponseGetUserResponse message(@javax.annotation.Nullable String message) { + public BaseResponseGetMeResponse message(@javax.annotation.Nullable String message) { this.message = message; return this; } @@ -142,12 +142,12 @@ public void setMessage(@javax.annotation.Nullable String message) { } - public BaseResponseGetUserResponse errors(@javax.annotation.Nullable List errors) { + public BaseResponseGetMeResponse errors(@javax.annotation.Nullable List errors) { this.errors = errors; return this; } - public BaseResponseGetUserResponse addErrorsItem(ErrorModel errorsItem) { + public BaseResponseGetMeResponse addErrorsItem(ErrorModel errorsItem) { if (this.errors == null) { this.errors = new ArrayList<>(); } @@ -169,7 +169,7 @@ public void setErrors(@javax.annotation.Nullable List errors) { } - public BaseResponseGetUserResponse meta(@javax.annotation.Nullable MetaModel meta) { + public BaseResponseGetMeResponse meta(@javax.annotation.Nullable MetaModel meta) { this.meta = meta; return this; } @@ -200,9 +200,9 @@ public void setMeta(@javax.annotation.Nullable MetaModel meta) { * * @param key name of the property * @param value value of the property - * @return the BaseResponseGetUserResponse instance itself + * @return the BaseResponseGetMeResponse instance itself */ - public BaseResponseGetUserResponse putAdditionalProperty(String key, Object value) { + public BaseResponseGetMeResponse putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { this.additionalProperties = new HashMap(); } @@ -241,13 +241,13 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - BaseResponseGetUserResponse baseResponseGetUserResponse = (BaseResponseGetUserResponse) o; - return Objects.equals(this.status, baseResponseGetUserResponse.status) && - Objects.equals(this.data, baseResponseGetUserResponse.data) && - Objects.equals(this.message, baseResponseGetUserResponse.message) && - Objects.equals(this.errors, baseResponseGetUserResponse.errors) && - Objects.equals(this.meta, baseResponseGetUserResponse.meta)&& - Objects.equals(this.additionalProperties, baseResponseGetUserResponse.additionalProperties); + BaseResponseGetMeResponse baseResponseGetMeResponse = (BaseResponseGetMeResponse) o; + return Objects.equals(this.status, baseResponseGetMeResponse.status) && + Objects.equals(this.data, baseResponseGetMeResponse.data) && + Objects.equals(this.message, baseResponseGetMeResponse.message) && + Objects.equals(this.errors, baseResponseGetMeResponse.errors) && + Objects.equals(this.meta, baseResponseGetMeResponse.meta)&& + Objects.equals(this.additionalProperties, baseResponseGetMeResponse.additionalProperties); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -269,7 +269,7 @@ private static int hashCodeNullable(JsonNullable a) { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class BaseResponseGetUserResponse {\n"); + sb.append("class BaseResponseGetMeResponse {\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" message: ").append(toIndentedString(message)).append("\n"); @@ -307,18 +307,18 @@ private String toIndentedString(Object o) { * Validates the JSON Element and throws an exception if issues found * * @param jsonElement JSON Element - * @throws IOException if the JSON Element is invalid with respect to BaseResponseGetUserResponse + * @throws IOException if the JSON Element is invalid with respect to BaseResponseGetMeResponse */ public static void validateJsonElement(JsonElement jsonElement) throws IOException { if (jsonElement == null) { - if (!BaseResponseGetUserResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null - throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in BaseResponseGetUserResponse is not found in the empty JSON string", BaseResponseGetUserResponse.openapiRequiredFields.toString())); + if (!BaseResponseGetMeResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null + throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in BaseResponseGetMeResponse is not found in the empty JSON string", BaseResponseGetMeResponse.openapiRequiredFields.toString())); } } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `data` if (jsonObj.get("data") != null && !jsonObj.get("data").isJsonNull()) { - GetUserResponse.validateJsonElement(jsonObj.get("data")); + GetMeResponse.validateJsonElement(jsonObj.get("data")); } if ((jsonObj.get("message") != null && !jsonObj.get("message").isJsonNull()) && !jsonObj.get("message").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `message` to be a primitive type in the JSON string but got `%s`", jsonObj.get("message").toString())); @@ -347,16 +347,16 @@ public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @SuppressWarnings("unchecked") @Override public TypeAdapter create(Gson gson, TypeToken type) { - if (!BaseResponseGetUserResponse.class.isAssignableFrom(type.getRawType())) { - return null; // this class only serializes 'BaseResponseGetUserResponse' and its subtypes + if (!BaseResponseGetMeResponse.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'BaseResponseGetMeResponse' and its subtypes } final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter - = gson.getDelegateAdapter(this, TypeToken.get(BaseResponseGetUserResponse.class)); + final TypeAdapter thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(BaseResponseGetMeResponse.class)); - return (TypeAdapter) new TypeAdapter() { + return (TypeAdapter) new TypeAdapter() { @Override - public void write(JsonWriter out, BaseResponseGetUserResponse value) throws IOException { + public void write(JsonWriter out, BaseResponseGetMeResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); obj.remove("additionalProperties"); // serialize additional properties @@ -384,12 +384,12 @@ else if (entry.getValue() instanceof Character) } @Override - public BaseResponseGetUserResponse read(JsonReader in) throws IOException { + public BaseResponseGetMeResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); JsonObject jsonObj = jsonElement.getAsJsonObject(); // store additional fields in the deserialized instance - BaseResponseGetUserResponse instance = thisAdapter.fromJsonTree(jsonObj); + BaseResponseGetMeResponse instance = thisAdapter.fromJsonTree(jsonObj); for (Map.Entry entry : jsonObj.entrySet()) { if (!openapiFields.contains(entry.getKey())) { if (entry.getValue().isJsonPrimitive()) { // primitive type @@ -416,18 +416,18 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean()) } /** - * Create an instance of BaseResponseGetUserResponse given an JSON string + * Create an instance of BaseResponseGetMeResponse given an JSON string * * @param jsonString JSON string - * @return An instance of BaseResponseGetUserResponse - * @throws IOException if the JSON string is invalid with respect to BaseResponseGetUserResponse + * @return An instance of BaseResponseGetMeResponse + * @throws IOException if the JSON string is invalid with respect to BaseResponseGetMeResponse */ - public static BaseResponseGetUserResponse fromJson(String jsonString) throws IOException { - return JSON.getGson().fromJson(jsonString, BaseResponseGetUserResponse.class); + public static BaseResponseGetMeResponse fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, BaseResponseGetMeResponse.class); } /** - * Convert an instance of BaseResponseGetUserResponse to an JSON string + * Convert an instance of BaseResponseGetMeResponse to an JSON string * * @return JSON string */ diff --git a/src/main/java/ai/reveng/model/FunctionMatchingRequest.java b/src/main/java/ai/reveng/model/FunctionMatchingRequest.java index 63005cb..594cf47 100644 --- a/src/main/java/ai/reveng/model/FunctionMatchingRequest.java +++ b/src/main/java/ai/reveng/model/FunctionMatchingRequest.java @@ -104,6 +104,12 @@ public class FunctionMatchingRequest { @javax.annotation.Nullable private Boolean noCache = false; + public static final String SERIALIZED_NAME_USE_CANONICAL_NAMES = "use_canonical_names"; + @Deprecated + @SerializedName(SERIALIZED_NAME_USE_CANONICAL_NAMES) + @javax.annotation.Nullable + private Boolean useCanonicalNames = false; + public FunctionMatchingRequest() { } @@ -304,6 +310,29 @@ public void setNoCache(@javax.annotation.Nullable Boolean noCache) { this.noCache = noCache; } + + @Deprecated + public FunctionMatchingRequest useCanonicalNames(@javax.annotation.Nullable Boolean useCanonicalNames) { + this.useCanonicalNames = useCanonicalNames; + return this; + } + + /** + * Whether to use canonical function names during function matching for confidence results, default is False + * @return useCanonicalNames + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + public Boolean getUseCanonicalNames() { + return useCanonicalNames; + } + + @Deprecated + public void setUseCanonicalNames(@javax.annotation.Nullable Boolean useCanonicalNames) { + this.useCanonicalNames = useCanonicalNames; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -367,7 +396,8 @@ public boolean equals(Object o) { Objects.equals(this.page, functionMatchingRequest.page) && Objects.equals(this.pageSize, functionMatchingRequest.pageSize) && Objects.equals(this.statusOnly, functionMatchingRequest.statusOnly) && - Objects.equals(this.noCache, functionMatchingRequest.noCache)&& + Objects.equals(this.noCache, functionMatchingRequest.noCache) && + Objects.equals(this.useCanonicalNames, functionMatchingRequest.useCanonicalNames)&& Objects.equals(this.additionalProperties, functionMatchingRequest.additionalProperties); } @@ -377,7 +407,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(modelId, functionIds, minSimilarity, filters, resultsPerFunction, page, pageSize, statusOnly, noCache, additionalProperties); + return Objects.hash(modelId, functionIds, minSimilarity, filters, resultsPerFunction, page, pageSize, statusOnly, noCache, useCanonicalNames, additionalProperties); } private static int hashCodeNullable(JsonNullable a) { @@ -400,6 +430,7 @@ public String toString() { sb.append(" pageSize: ").append(toIndentedString(pageSize)).append("\n"); sb.append(" statusOnly: ").append(toIndentedString(statusOnly)).append("\n"); sb.append(" noCache: ").append(toIndentedString(noCache)).append("\n"); + sb.append(" useCanonicalNames: ").append(toIndentedString(useCanonicalNames)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -422,7 +453,7 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("model_id", "function_ids", "min_similarity", "filters", "results_per_function", "page", "page_size", "status_only", "no_cache")); + openapiFields = new HashSet(Arrays.asList("model_id", "function_ids", "min_similarity", "filters", "results_per_function", "page", "page_size", "status_only", "no_cache", "use_canonical_names")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(Arrays.asList("model_id", "function_ids")); diff --git a/src/main/java/ai/reveng/model/GetUserResponse.java b/src/main/java/ai/reveng/model/GetMeResponse.java similarity index 72% rename from src/main/java/ai/reveng/model/GetUserResponse.java rename to src/main/java/ai/reveng/model/GetMeResponse.java index 650678e..b992d59 100644 --- a/src/main/java/ai/reveng/model/GetUserResponse.java +++ b/src/main/java/ai/reveng/model/GetMeResponse.java @@ -48,10 +48,10 @@ import ai.reveng.invoker.JSON; /** - * GetUserResponse + * GetMeResponse */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class GetUserResponse { +public class GetMeResponse { public static final String SERIALIZED_NAME_USERNAME = "username"; @SerializedName(SERIALIZED_NAME_USERNAME) @javax.annotation.Nonnull @@ -87,10 +87,71 @@ public class GetUserResponse { @javax.annotation.Nonnull private Boolean tutorialSeen; - public GetUserResponse() { + /** + * Gets or Sets role + */ + @JsonAdapter(RoleEnum.Adapter.class) + public enum RoleEnum { + USER("USER"), + + ADMIN("ADMIN"), + + SUPERADMIN("SUPERADMIN"), + + SYSTEM("SYSTEM"); + + private String value; + + RoleEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static RoleEnum fromValue(String value) { + for (RoleEnum b : RoleEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final RoleEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public RoleEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return RoleEnum.fromValue(value); + } + } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + RoleEnum.fromValue(value); + } + } + + public static final String SERIALIZED_NAME_ROLE = "role"; + @SerializedName(SERIALIZED_NAME_ROLE) + @javax.annotation.Nonnull + private RoleEnum role; + + public GetMeResponse() { } - public GetUserResponse username(@javax.annotation.Nonnull String username) { + public GetMeResponse username(@javax.annotation.Nonnull String username) { this.username = username; return this; } @@ -109,7 +170,7 @@ public void setUsername(@javax.annotation.Nonnull String username) { } - public GetUserResponse userId(@javax.annotation.Nonnull Integer userId) { + public GetMeResponse userId(@javax.annotation.Nonnull Integer userId) { this.userId = userId; return this; } @@ -128,7 +189,7 @@ public void setUserId(@javax.annotation.Nonnull Integer userId) { } - public GetUserResponse firstName(@javax.annotation.Nonnull String firstName) { + public GetMeResponse firstName(@javax.annotation.Nonnull String firstName) { this.firstName = firstName; return this; } @@ -147,7 +208,7 @@ public void setFirstName(@javax.annotation.Nonnull String firstName) { } - public GetUserResponse lastName(@javax.annotation.Nonnull String lastName) { + public GetMeResponse lastName(@javax.annotation.Nonnull String lastName) { this.lastName = lastName; return this; } @@ -166,7 +227,7 @@ public void setLastName(@javax.annotation.Nonnull String lastName) { } - public GetUserResponse email(@javax.annotation.Nonnull String email) { + public GetMeResponse email(@javax.annotation.Nonnull String email) { this.email = email; return this; } @@ -185,7 +246,7 @@ public void setEmail(@javax.annotation.Nonnull String email) { } - public GetUserResponse creation(@javax.annotation.Nonnull OffsetDateTime creation) { + public GetMeResponse creation(@javax.annotation.Nonnull OffsetDateTime creation) { this.creation = creation; return this; } @@ -204,7 +265,7 @@ public void setCreation(@javax.annotation.Nonnull OffsetDateTime creation) { } - public GetUserResponse tutorialSeen(@javax.annotation.Nonnull Boolean tutorialSeen) { + public GetMeResponse tutorialSeen(@javax.annotation.Nonnull Boolean tutorialSeen) { this.tutorialSeen = tutorialSeen; return this; } @@ -222,6 +283,25 @@ public void setTutorialSeen(@javax.annotation.Nonnull Boolean tutorialSeen) { this.tutorialSeen = tutorialSeen; } + + public GetMeResponse role(@javax.annotation.Nonnull RoleEnum role) { + this.role = role; + return this; + } + + /** + * Get role + * @return role + */ + @javax.annotation.Nonnull + public RoleEnum getRole() { + return role; + } + + public void setRole(@javax.annotation.Nonnull RoleEnum role) { + this.role = role; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -235,9 +315,9 @@ public void setTutorialSeen(@javax.annotation.Nonnull Boolean tutorialSeen) { * * @param key name of the property * @param value value of the property - * @return the GetUserResponse instance itself + * @return the GetMeResponse instance itself */ - public GetUserResponse putAdditionalProperty(String key, Object value) { + public GetMeResponse putAdditionalProperty(String key, Object value) { if (this.additionalProperties == null) { this.additionalProperties = new HashMap(); } @@ -276,26 +356,27 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - GetUserResponse getUserResponse = (GetUserResponse) o; - return Objects.equals(this.username, getUserResponse.username) && - Objects.equals(this.userId, getUserResponse.userId) && - Objects.equals(this.firstName, getUserResponse.firstName) && - Objects.equals(this.lastName, getUserResponse.lastName) && - Objects.equals(this.email, getUserResponse.email) && - Objects.equals(this.creation, getUserResponse.creation) && - Objects.equals(this.tutorialSeen, getUserResponse.tutorialSeen)&& - Objects.equals(this.additionalProperties, getUserResponse.additionalProperties); + GetMeResponse getMeResponse = (GetMeResponse) o; + return Objects.equals(this.username, getMeResponse.username) && + Objects.equals(this.userId, getMeResponse.userId) && + Objects.equals(this.firstName, getMeResponse.firstName) && + Objects.equals(this.lastName, getMeResponse.lastName) && + Objects.equals(this.email, getMeResponse.email) && + Objects.equals(this.creation, getMeResponse.creation) && + Objects.equals(this.tutorialSeen, getMeResponse.tutorialSeen) && + Objects.equals(this.role, getMeResponse.role)&& + Objects.equals(this.additionalProperties, getMeResponse.additionalProperties); } @Override public int hashCode() { - return Objects.hash(username, userId, firstName, lastName, email, creation, tutorialSeen, additionalProperties); + return Objects.hash(username, userId, firstName, lastName, email, creation, tutorialSeen, role, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class GetUserResponse {\n"); + sb.append("class GetMeResponse {\n"); sb.append(" username: ").append(toIndentedString(username)).append("\n"); sb.append(" userId: ").append(toIndentedString(userId)).append("\n"); sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); @@ -303,6 +384,7 @@ public String toString() { sb.append(" email: ").append(toIndentedString(email)).append("\n"); sb.append(" creation: ").append(toIndentedString(creation)).append("\n"); sb.append(" tutorialSeen: ").append(toIndentedString(tutorialSeen)).append("\n"); + sb.append(" role: ").append(toIndentedString(role)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -325,27 +407,27 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("username", "user_id", "first_name", "last_name", "email", "creation", "tutorial_seen")); + openapiFields = new HashSet(Arrays.asList("username", "user_id", "first_name", "last_name", "email", "creation", "tutorial_seen", "role")); // a set of required properties/fields (JSON key names) - openapiRequiredFields = new HashSet(Arrays.asList("username", "user_id", "first_name", "last_name", "email", "creation", "tutorial_seen")); + openapiRequiredFields = new HashSet(Arrays.asList("username", "user_id", "first_name", "last_name", "email", "creation", "tutorial_seen", "role")); } /** * Validates the JSON Element and throws an exception if issues found * * @param jsonElement JSON Element - * @throws IOException if the JSON Element is invalid with respect to GetUserResponse + * @throws IOException if the JSON Element is invalid with respect to GetMeResponse */ public static void validateJsonElement(JsonElement jsonElement) throws IOException { if (jsonElement == null) { - if (!GetUserResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null - throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in GetUserResponse is not found in the empty JSON string", GetUserResponse.openapiRequiredFields.toString())); + if (!GetMeResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null + throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in GetMeResponse is not found in the empty JSON string", GetMeResponse.openapiRequiredFields.toString())); } } // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : GetUserResponse.openapiRequiredFields) { + for (String requiredField : GetMeResponse.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); } @@ -363,22 +445,27 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("email").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `email` to be a primitive type in the JSON string but got `%s`", jsonObj.get("email").toString())); } + if (!jsonObj.get("role").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `role` to be a primitive type in the JSON string but got `%s`", jsonObj.get("role").toString())); + } + // validate the required field `role` + RoleEnum.validateJsonElement(jsonObj.get("role")); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @SuppressWarnings("unchecked") @Override public TypeAdapter create(Gson gson, TypeToken type) { - if (!GetUserResponse.class.isAssignableFrom(type.getRawType())) { - return null; // this class only serializes 'GetUserResponse' and its subtypes + if (!GetMeResponse.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'GetMeResponse' and its subtypes } final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); - final TypeAdapter thisAdapter - = gson.getDelegateAdapter(this, TypeToken.get(GetUserResponse.class)); + final TypeAdapter thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(GetMeResponse.class)); - return (TypeAdapter) new TypeAdapter() { + return (TypeAdapter) new TypeAdapter() { @Override - public void write(JsonWriter out, GetUserResponse value) throws IOException { + public void write(JsonWriter out, GetMeResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); obj.remove("additionalProperties"); // serialize additional properties @@ -406,12 +493,12 @@ else if (entry.getValue() instanceof Character) } @Override - public GetUserResponse read(JsonReader in) throws IOException { + public GetMeResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); JsonObject jsonObj = jsonElement.getAsJsonObject(); // store additional fields in the deserialized instance - GetUserResponse instance = thisAdapter.fromJsonTree(jsonObj); + GetMeResponse instance = thisAdapter.fromJsonTree(jsonObj); for (Map.Entry entry : jsonObj.entrySet()) { if (!openapiFields.contains(entry.getKey())) { if (entry.getValue().isJsonPrimitive()) { // primitive type @@ -438,18 +525,18 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean()) } /** - * Create an instance of GetUserResponse given an JSON string + * Create an instance of GetMeResponse given an JSON string * * @param jsonString JSON string - * @return An instance of GetUserResponse - * @throws IOException if the JSON string is invalid with respect to GetUserResponse + * @return An instance of GetMeResponse + * @throws IOException if the JSON string is invalid with respect to GetMeResponse */ - public static GetUserResponse fromJson(String jsonString) throws IOException { - return JSON.getGson().fromJson(jsonString, GetUserResponse.class); + public static GetMeResponse fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, GetMeResponse.class); } /** - * Convert an instance of GetUserResponse to an JSON string + * Convert an instance of GetMeResponse to an JSON string * * @return JSON string */ diff --git a/src/test/java/ai/reveng/api/AuthenticationUsersApiTest.java b/src/test/java/ai/reveng/api/AuthenticationUsersApiTest.java index b8785c8..9bca61f 100644 --- a/src/test/java/ai/reveng/api/AuthenticationUsersApiTest.java +++ b/src/test/java/ai/reveng/api/AuthenticationUsersApiTest.java @@ -14,8 +14,8 @@ import ai.reveng.invoker.ApiException; import ai.reveng.model.BaseResponse; +import ai.reveng.model.BaseResponseGetMeResponse; import ai.reveng.model.BaseResponseGetPublicUserResponse; -import ai.reveng.model.BaseResponseGetUserResponse; import ai.reveng.model.BaseResponseListCommentResponse; import ai.reveng.model.BaseResponseListUserActivityResponse; import ai.reveng.model.BaseResponseLoginResponse; @@ -43,7 +43,7 @@ public class AuthenticationUsersApiTest { */ @Test public void getRequesterUserInfoTest() throws ApiException { - BaseResponseGetUserResponse response = api.getRequesterUserInfo(); + BaseResponseGetMeResponse response = api.getRequesterUserInfo(); // TODO: test validations } diff --git a/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java b/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java index f4e942c..f2bc20d 100644 --- a/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java +++ b/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java @@ -95,4 +95,12 @@ public void noCacheTest() { // TODO: test noCache } + /** + * Test the property 'useCanonicalNames' + */ + @Test + public void useCanonicalNamesTest() { + // TODO: test useCanonicalNames + } + } diff --git a/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java b/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java index d624d6c..8176631 100644 --- a/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java +++ b/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java @@ -85,4 +85,12 @@ public void noCacheTest() { // TODO: test noCache } + /** + * Test the property 'useCanonicalNames' + */ + @Test + public void useCanonicalNamesTest() { + // TODO: test useCanonicalNames + } + } diff --git a/src/test/java/ai/reveng/model/BaseResponseGetUserResponseTest.java b/src/test/java/ai/reveng/model/BaseResponseGetMeResponseTest.java similarity index 79% rename from src/test/java/ai/reveng/model/BaseResponseGetUserResponseTest.java rename to src/test/java/ai/reveng/model/BaseResponseGetMeResponseTest.java index 4b634ac..76e7e82 100644 --- a/src/test/java/ai/reveng/model/BaseResponseGetUserResponseTest.java +++ b/src/test/java/ai/reveng/model/BaseResponseGetMeResponseTest.java @@ -13,7 +13,7 @@ package ai.reveng.model; import ai.reveng.model.ErrorModel; -import ai.reveng.model.GetUserResponse; +import ai.reveng.model.GetMeResponse; import ai.reveng.model.MetaModel; import com.google.gson.TypeAdapter; import com.google.gson.annotations.JsonAdapter; @@ -29,17 +29,17 @@ import org.junit.jupiter.api.Test; /** - * Model tests for BaseResponseGetUserResponse + * Model tests for BaseResponseGetMeResponse */ -public class BaseResponseGetUserResponseTest { - private final BaseResponseGetUserResponse model = new BaseResponseGetUserResponse(); +public class BaseResponseGetMeResponseTest { + private final BaseResponseGetMeResponse model = new BaseResponseGetMeResponse(); /** - * Model tests for BaseResponseGetUserResponse + * Model tests for BaseResponseGetMeResponse */ @Test - public void testBaseResponseGetUserResponse() { - // TODO: test BaseResponseGetUserResponse + public void testBaseResponseGetMeResponse() { + // TODO: test BaseResponseGetMeResponse } /** diff --git a/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java b/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java index 0b378a9..fe1d752 100644 --- a/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java +++ b/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java @@ -113,4 +113,12 @@ public void noCacheTest() { // TODO: test noCache } + /** + * Test the property 'useCanonicalNames' + */ + @Test + public void useCanonicalNamesTest() { + // TODO: test useCanonicalNames + } + } diff --git a/src/test/java/ai/reveng/model/GetUserResponseTest.java b/src/test/java/ai/reveng/model/GetMeResponseTest.java similarity index 82% rename from src/test/java/ai/reveng/model/GetUserResponseTest.java rename to src/test/java/ai/reveng/model/GetMeResponseTest.java index c736ae6..a33487d 100644 --- a/src/test/java/ai/reveng/model/GetUserResponseTest.java +++ b/src/test/java/ai/reveng/model/GetMeResponseTest.java @@ -24,17 +24,17 @@ import org.junit.jupiter.api.Test; /** - * Model tests for GetUserResponse + * Model tests for GetMeResponse */ -public class GetUserResponseTest { - private final GetUserResponse model = new GetUserResponse(); +public class GetMeResponseTest { + private final GetMeResponse model = new GetMeResponse(); /** - * Model tests for GetUserResponse + * Model tests for GetMeResponse */ @Test - public void testGetUserResponse() { - // TODO: test GetUserResponse + public void testGetMeResponse() { + // TODO: test GetMeResponse } /** @@ -93,4 +93,12 @@ public void tutorialSeenTest() { // TODO: test tutorialSeen } + /** + * Test the property 'role' + */ + @Test + public void roleTest() { + // TODO: test role + } + }