*/
- public FunctionMatchingBatchResponse analysisFunctionMatching(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nonnull AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest) throws ApiException {
- ApiResponse localVarResp = analysisFunctionMatchingWithHttpInfo(analysisId, analysisFunctionMatchingRequest);
+ public FunctionMatchingResponse analysisFunctionMatching(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nonnull AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest) throws ApiException {
+ ApiResponse localVarResp = analysisFunctionMatchingWithHttpInfo(analysisId, analysisFunctionMatchingRequest);
return localVarResp.getData();
}
@@ -326,7 +326,7 @@ public FunctionMatchingBatchResponse analysisFunctionMatching(@javax.annotation.
* Takes in an analysis id and settings and matches the nearest functions to the ones associated with it. Results can optionally be filtered by collection, binary, debug type or (other) function ids
* @param analysisId (required)
* @param analysisFunctionMatchingRequest (required)
- * @return ApiResponse<FunctionMatchingBatchResponse>
+ * @return ApiResponse<FunctionMatchingResponse>
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
* @http.response.details
@@ -336,9 +336,9 @@ public FunctionMatchingBatchResponse analysisFunctionMatching(@javax.annotation.
422
Invalid request parameters
-
*/
- public ApiResponse analysisFunctionMatchingWithHttpInfo(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nonnull AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest) throws ApiException {
+ public ApiResponse analysisFunctionMatchingWithHttpInfo(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nonnull AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest) throws ApiException {
okhttp3.Call localVarCall = analysisFunctionMatchingValidateBeforeCall(analysisId, analysisFunctionMatchingRequest, null);
- Type localVarReturnType = new TypeToken(){}.getType();
+ Type localVarReturnType = new TypeToken(){}.getType();
return localVarApiClient.execute(localVarCall, localVarReturnType);
}
@@ -358,10 +358,10 @@ public ApiResponse analysisFunctionMatchingWithHt
422
Invalid request parameters
-
*/
- public okhttp3.Call analysisFunctionMatchingAsync(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nonnull AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest, final ApiCallback _callback) throws ApiException {
+ public okhttp3.Call analysisFunctionMatchingAsync(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nonnull AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest, final ApiCallback _callback) throws ApiException {
okhttp3.Call localVarCall = analysisFunctionMatchingValidateBeforeCall(analysisId, analysisFunctionMatchingRequest, _callback);
- Type localVarReturnType = new TypeToken(){}.getType();
+ Type localVarReturnType = new TypeToken(){}.getType();
localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
return localVarCall;
}
@@ -580,7 +580,7 @@ private okhttp3.Call batchFunctionMatchingValidateBeforeCall(@javax.annotation.N
* Perform function matching for an arbitrary batch of functions, binaries or collections
* Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the system
* @param functionMatchingRequest (required)
- * @return FunctionMatchingBatchResponse
+ * @return FunctionMatchingResponse
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
* @http.response.details
*/
- public FunctionMatchingBatchResponse batchFunctionMatching(@javax.annotation.Nonnull FunctionMatchingRequest functionMatchingRequest) throws ApiException {
- ApiResponse localVarResp = batchFunctionMatchingWithHttpInfo(functionMatchingRequest);
+ public FunctionMatchingResponse batchFunctionMatching(@javax.annotation.Nonnull FunctionMatchingRequest functionMatchingRequest) throws ApiException {
+ ApiResponse localVarResp = batchFunctionMatchingWithHttpInfo(functionMatchingRequest);
return localVarResp.getData();
}
@@ -599,7 +599,7 @@ public FunctionMatchingBatchResponse batchFunctionMatching(@javax.annotation.Non
* Perform function matching for an arbitrary batch of functions, binaries or collections
* Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the system
* @param functionMatchingRequest (required)
- * @return ApiResponse<FunctionMatchingBatchResponse>
+ * @return ApiResponse<FunctionMatchingResponse>
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
* @http.response.details
@@ -609,9 +609,9 @@ public FunctionMatchingBatchResponse batchFunctionMatching(@javax.annotation.Non
422
Invalid request parameters
-
*/
- public ApiResponse batchFunctionMatchingWithHttpInfo(@javax.annotation.Nonnull FunctionMatchingRequest functionMatchingRequest) throws ApiException {
+ public ApiResponse batchFunctionMatchingWithHttpInfo(@javax.annotation.Nonnull FunctionMatchingRequest functionMatchingRequest) throws ApiException {
okhttp3.Call localVarCall = batchFunctionMatchingValidateBeforeCall(functionMatchingRequest, null);
- Type localVarReturnType = new TypeToken(){}.getType();
+ Type localVarReturnType = new TypeToken(){}.getType();
return localVarApiClient.execute(localVarCall, localVarReturnType);
}
@@ -630,10 +630,10 @@ public ApiResponse batchFunctionMatchingWithHttpI
422
Invalid request parameters
-
*/
- public okhttp3.Call batchFunctionMatchingAsync(@javax.annotation.Nonnull FunctionMatchingRequest functionMatchingRequest, final ApiCallback _callback) throws ApiException {
+ public okhttp3.Call batchFunctionMatchingAsync(@javax.annotation.Nonnull FunctionMatchingRequest functionMatchingRequest, final ApiCallback _callback) throws ApiException {
okhttp3.Call localVarCall = batchFunctionMatchingValidateBeforeCall(functionMatchingRequest, _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 a81ae41..e38abe9 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.43.0/java");
+ setUserAgent("OpenAPI-Generator/2.46.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 249e03f..7f062a9 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.43.0";
+ public static final String VERSION = "2.46.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 c333c79..6b2a79f 100644
--- a/src/main/java/ai/reveng/invoker/JSON.java
+++ b/src/main/java/ai/reveng/invoker/JSON.java
@@ -260,10 +260,10 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionLocalVariableResponse.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMapping.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMappingFull.CustomTypeAdapterFactory());
- gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMatchingBatchResponse.CustomTypeAdapterFactory());
+ gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMatch.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMatchingFilters.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMatchingRequest.CustomTypeAdapterFactory());
- gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMatchingResultWithBestMatch.CustomTypeAdapterFactory());
+ gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionMatchingResponse.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionNameHistory.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionParamResponse.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(new ai.reveng.model.FunctionRename.CustomTypeAdapterFactory());
diff --git a/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java b/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java
index 180de6a..661b681 100644
--- a/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java
+++ b/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java
@@ -70,16 +70,19 @@ public class AnalysisFunctionMatchingRequest {
private Integer resultsPerFunction = 1;
public static final String SERIALIZED_NAME_PAGE = "page";
+ @Deprecated
@SerializedName(SERIALIZED_NAME_PAGE)
@javax.annotation.Nullable
private Integer page = 1;
public static final String SERIALIZED_NAME_PAGE_SIZE = "page_size";
+ @Deprecated
@SerializedName(SERIALIZED_NAME_PAGE_SIZE)
@javax.annotation.Nullable
private Integer pageSize = 0;
public static final String SERIALIZED_NAME_STATUS_ONLY = "status_only";
+ @Deprecated
@SerializedName(SERIALIZED_NAME_STATUS_ONLY)
@javax.annotation.Nullable
private Boolean statusOnly = false;
@@ -153,6 +156,7 @@ public void setResultsPerFunction(@javax.annotation.Nullable Integer resultsPerF
}
+ @Deprecated
public AnalysisFunctionMatchingRequest page(@javax.annotation.Nullable Integer page) {
this.page = page;
return this;
@@ -162,17 +166,21 @@ public AnalysisFunctionMatchingRequest page(@javax.annotation.Nullable Integer p
* Page number for paginated results, default is 1 (first page)
* minimum: 1
* @return page
+ * @deprecated
*/
+ @Deprecated
@javax.annotation.Nullable
public Integer getPage() {
return page;
}
+ @Deprecated
public void setPage(@javax.annotation.Nullable Integer page) {
this.page = page;
}
+ @Deprecated
public AnalysisFunctionMatchingRequest pageSize(@javax.annotation.Nullable Integer pageSize) {
this.pageSize = pageSize;
return this;
@@ -183,17 +191,21 @@ public AnalysisFunctionMatchingRequest pageSize(@javax.annotation.Nullable Integ
* minimum: 0
* maximum: 1000
* @return pageSize
+ * @deprecated
*/
+ @Deprecated
@javax.annotation.Nullable
public Integer getPageSize() {
return pageSize;
}
+ @Deprecated
public void setPageSize(@javax.annotation.Nullable Integer pageSize) {
this.pageSize = pageSize;
}
+ @Deprecated
public AnalysisFunctionMatchingRequest statusOnly(@javax.annotation.Nullable Boolean statusOnly) {
this.statusOnly = statusOnly;
return this;
@@ -202,12 +214,15 @@ public AnalysisFunctionMatchingRequest statusOnly(@javax.annotation.Nullable Boo
/**
* If set to true, only returns the status of the matching operation without the actual results
* @return statusOnly
+ * @deprecated
*/
+ @Deprecated
@javax.annotation.Nullable
public Boolean getStatusOnly() {
return statusOnly;
}
+ @Deprecated
public void setStatusOnly(@javax.annotation.Nullable Boolean statusOnly) {
this.statusOnly = statusOnly;
}
diff --git a/src/main/java/ai/reveng/model/FunctionMatchingResultWithBestMatch.java b/src/main/java/ai/reveng/model/FunctionMatch.java
similarity index 80%
rename from src/main/java/ai/reveng/model/FunctionMatchingResultWithBestMatch.java
rename to src/main/java/ai/reveng/model/FunctionMatch.java
index 72aafe9..555875c 100644
--- a/src/main/java/ai/reveng/model/FunctionMatchingResultWithBestMatch.java
+++ b/src/main/java/ai/reveng/model/FunctionMatch.java
@@ -52,10 +52,10 @@
import ai.reveng.invoker.JSON;
/**
- * FunctionMatchingResultWithBestMatch
+ * FunctionMatch
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class FunctionMatchingResultWithBestMatch {
+public class FunctionMatch {
public static final String SERIALIZED_NAME_FUNCTION_ID = "function_id";
@SerializedName(SERIALIZED_NAME_FUNCTION_ID)
@javax.annotation.Nonnull
@@ -71,10 +71,10 @@ public class FunctionMatchingResultWithBestMatch {
@javax.annotation.Nullable
private List confidences;
- public FunctionMatchingResultWithBestMatch() {
+ public FunctionMatch() {
}
- public FunctionMatchingResultWithBestMatch functionId(@javax.annotation.Nonnull Long functionId) {
+ public FunctionMatch functionId(@javax.annotation.Nonnull Long functionId) {
this.functionId = functionId;
return this;
}
@@ -93,12 +93,12 @@ public void setFunctionId(@javax.annotation.Nonnull Long functionId) {
}
- public FunctionMatchingResultWithBestMatch matchedFunctions(@javax.annotation.Nonnull List matchedFunctions) {
+ public FunctionMatch matchedFunctions(@javax.annotation.Nonnull List matchedFunctions) {
this.matchedFunctions = matchedFunctions;
return this;
}
- public FunctionMatchingResultWithBestMatch addMatchedFunctionsItem(MatchedFunction matchedFunctionsItem) {
+ public FunctionMatch addMatchedFunctionsItem(MatchedFunction matchedFunctionsItem) {
if (this.matchedFunctions == null) {
this.matchedFunctions = new ArrayList<>();
}
@@ -120,12 +120,12 @@ public void setMatchedFunctions(@javax.annotation.Nonnull List
}
- public FunctionMatchingResultWithBestMatch confidences(@javax.annotation.Nullable List confidences) {
+ public FunctionMatch confidences(@javax.annotation.Nullable List confidences) {
this.confidences = confidences;
return this;
}
- public FunctionMatchingResultWithBestMatch addConfidencesItem(NameConfidence confidencesItem) {
+ public FunctionMatch addConfidencesItem(NameConfidence confidencesItem) {
if (this.confidences == null) {
this.confidences = new ArrayList<>();
}
@@ -159,9 +159,9 @@ public void setConfidences(@javax.annotation.Nullable List confi
*
* @param key name of the property
* @param value value of the property
- * @return the FunctionMatchingResultWithBestMatch instance itself
+ * @return the FunctionMatch instance itself
*/
- public FunctionMatchingResultWithBestMatch putAdditionalProperty(String key, Object value) {
+ public FunctionMatch putAdditionalProperty(String key, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap();
}
@@ -200,11 +200,11 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
- FunctionMatchingResultWithBestMatch functionMatchingResultWithBestMatch = (FunctionMatchingResultWithBestMatch) o;
- return Objects.equals(this.functionId, functionMatchingResultWithBestMatch.functionId) &&
- Objects.equals(this.matchedFunctions, functionMatchingResultWithBestMatch.matchedFunctions) &&
- Objects.equals(this.confidences, functionMatchingResultWithBestMatch.confidences)&&
- Objects.equals(this.additionalProperties, functionMatchingResultWithBestMatch.additionalProperties);
+ FunctionMatch functionMatch = (FunctionMatch) o;
+ return Objects.equals(this.functionId, functionMatch.functionId) &&
+ Objects.equals(this.matchedFunctions, functionMatch.matchedFunctions) &&
+ Objects.equals(this.confidences, functionMatch.confidences)&&
+ Objects.equals(this.additionalProperties, functionMatch.additionalProperties);
}
private static boolean equalsNullable(JsonNullable a, JsonNullable b) {
@@ -226,7 +226,7 @@ private static int hashCodeNullable(JsonNullable a) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("class FunctionMatchingResultWithBestMatch {\n");
+ sb.append("class FunctionMatch {\n");
sb.append(" functionId: ").append(toIndentedString(functionId)).append("\n");
sb.append(" matchedFunctions: ").append(toIndentedString(matchedFunctions)).append("\n");
sb.append(" confidences: ").append(toIndentedString(confidences)).append("\n");
@@ -262,17 +262,17 @@ 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 FunctionMatchingResultWithBestMatch
+ * @throws IOException if the JSON Element is invalid with respect to FunctionMatch
*/
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
- if (!FunctionMatchingResultWithBestMatch.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
- throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in FunctionMatchingResultWithBestMatch is not found in the empty JSON string", FunctionMatchingResultWithBestMatch.openapiRequiredFields.toString()));
+ if (!FunctionMatch.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
+ throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in FunctionMatch is not found in the empty JSON string", FunctionMatch.openapiRequiredFields.toString()));
}
}
// check to make sure all required properties/fields are present in the JSON string
- for (String requiredField : FunctionMatchingResultWithBestMatch.openapiRequiredFields) {
+ for (String requiredField : FunctionMatch.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()));
}
@@ -308,16 +308,16 @@ public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
@SuppressWarnings("unchecked")
@Override
public TypeAdapter create(Gson gson, TypeToken type) {
- if (!FunctionMatchingResultWithBestMatch.class.isAssignableFrom(type.getRawType())) {
- return null; // this class only serializes 'FunctionMatchingResultWithBestMatch' and its subtypes
+ if (!FunctionMatch.class.isAssignableFrom(type.getRawType())) {
+ return null; // this class only serializes 'FunctionMatch' and its subtypes
}
final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class);
- final TypeAdapter thisAdapter
- = gson.getDelegateAdapter(this, TypeToken.get(FunctionMatchingResultWithBestMatch.class));
+ final TypeAdapter thisAdapter
+ = gson.getDelegateAdapter(this, TypeToken.get(FunctionMatch.class));
- return (TypeAdapter) new TypeAdapter() {
+ return (TypeAdapter) new TypeAdapter() {
@Override
- public void write(JsonWriter out, FunctionMatchingResultWithBestMatch value) throws IOException {
+ public void write(JsonWriter out, FunctionMatch value) throws IOException {
JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
obj.remove("additionalProperties");
// serialize additional properties
@@ -345,12 +345,12 @@ else if (entry.getValue() instanceof Character)
}
@Override
- public FunctionMatchingResultWithBestMatch read(JsonReader in) throws IOException {
+ public FunctionMatch read(JsonReader in) throws IOException {
JsonElement jsonElement = elementAdapter.read(in);
validateJsonElement(jsonElement);
JsonObject jsonObj = jsonElement.getAsJsonObject();
// store additional fields in the deserialized instance
- FunctionMatchingResultWithBestMatch instance = thisAdapter.fromJsonTree(jsonObj);
+ FunctionMatch instance = thisAdapter.fromJsonTree(jsonObj);
for (Map.Entry entry : jsonObj.entrySet()) {
if (!openapiFields.contains(entry.getKey())) {
if (entry.getValue().isJsonPrimitive()) { // primitive type
@@ -377,18 +377,18 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
/**
- * Create an instance of FunctionMatchingResultWithBestMatch given an JSON string
+ * Create an instance of FunctionMatch given an JSON string
*
* @param jsonString JSON string
- * @return An instance of FunctionMatchingResultWithBestMatch
- * @throws IOException if the JSON string is invalid with respect to FunctionMatchingResultWithBestMatch
+ * @return An instance of FunctionMatch
+ * @throws IOException if the JSON string is invalid with respect to FunctionMatch
*/
- public static FunctionMatchingResultWithBestMatch fromJson(String jsonString) throws IOException {
- return JSON.getGson().fromJson(jsonString, FunctionMatchingResultWithBestMatch.class);
+ public static FunctionMatch fromJson(String jsonString) throws IOException {
+ return JSON.getGson().fromJson(jsonString, FunctionMatch.class);
}
/**
- * Convert an instance of FunctionMatchingResultWithBestMatch to an JSON string
+ * Convert an instance of FunctionMatch 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 a3164fc..63005cb 100644
--- a/src/main/java/ai/reveng/model/FunctionMatchingRequest.java
+++ b/src/main/java/ai/reveng/model/FunctionMatchingRequest.java
@@ -82,16 +82,19 @@ public class FunctionMatchingRequest {
private Integer resultsPerFunction = 1;
public static final String SERIALIZED_NAME_PAGE = "page";
+ @Deprecated
@SerializedName(SERIALIZED_NAME_PAGE)
@javax.annotation.Nullable
private Integer page = 1;
public static final String SERIALIZED_NAME_PAGE_SIZE = "page_size";
+ @Deprecated
@SerializedName(SERIALIZED_NAME_PAGE_SIZE)
@javax.annotation.Nullable
private Integer pageSize = 0;
public static final String SERIALIZED_NAME_STATUS_ONLY = "status_only";
+ @Deprecated
@SerializedName(SERIALIZED_NAME_STATUS_ONLY)
@javax.annotation.Nullable
private Boolean statusOnly = false;
@@ -211,6 +214,7 @@ public void setResultsPerFunction(@javax.annotation.Nullable Integer resultsPerF
}
+ @Deprecated
public FunctionMatchingRequest page(@javax.annotation.Nullable Integer page) {
this.page = page;
return this;
@@ -220,17 +224,21 @@ public FunctionMatchingRequest page(@javax.annotation.Nullable Integer page) {
* Page number for paginated results, default is 1 (first page)
* minimum: 1
* @return page
+ * @deprecated
*/
+ @Deprecated
@javax.annotation.Nullable
public Integer getPage() {
return page;
}
+ @Deprecated
public void setPage(@javax.annotation.Nullable Integer page) {
this.page = page;
}
+ @Deprecated
public FunctionMatchingRequest pageSize(@javax.annotation.Nullable Integer pageSize) {
this.pageSize = pageSize;
return this;
@@ -241,17 +249,21 @@ public FunctionMatchingRequest pageSize(@javax.annotation.Nullable Integer pageS
* minimum: 0
* maximum: 1000
* @return pageSize
+ * @deprecated
*/
+ @Deprecated
@javax.annotation.Nullable
public Integer getPageSize() {
return pageSize;
}
+ @Deprecated
public void setPageSize(@javax.annotation.Nullable Integer pageSize) {
this.pageSize = pageSize;
}
+ @Deprecated
public FunctionMatchingRequest statusOnly(@javax.annotation.Nullable Boolean statusOnly) {
this.statusOnly = statusOnly;
return this;
@@ -260,12 +272,15 @@ public FunctionMatchingRequest statusOnly(@javax.annotation.Nullable Boolean sta
/**
* If set to true, only returns the status of the matching operation without the actual results
* @return statusOnly
+ * @deprecated
*/
+ @Deprecated
@javax.annotation.Nullable
public Boolean getStatusOnly() {
return statusOnly;
}
+ @Deprecated
public void setStatusOnly(@javax.annotation.Nullable Boolean statusOnly) {
this.statusOnly = statusOnly;
}
diff --git a/src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java b/src/main/java/ai/reveng/model/FunctionMatchingResponse.java
similarity index 69%
rename from src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java
rename to src/main/java/ai/reveng/model/FunctionMatchingResponse.java
index f0fa76e..94b814b 100644
--- a/src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java
+++ b/src/main/java/ai/reveng/model/FunctionMatchingResponse.java
@@ -14,7 +14,7 @@
import java.util.Objects;
import java.util.Locale;
-import ai.reveng.model.FunctionMatchingResultWithBestMatch;
+import ai.reveng.model.FunctionMatch;
import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
@@ -51,10 +51,10 @@
import ai.reveng.invoker.JSON;
/**
- * FunctionMatchingBatchResponse
+ * FunctionMatchingResponse
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class FunctionMatchingBatchResponse {
+public class FunctionMatchingResponse {
public static final String SERIALIZED_NAME_PROGRESS = "progress";
@SerializedName(SERIALIZED_NAME_PROGRESS)
@javax.annotation.Nullable
@@ -88,12 +88,27 @@ public class FunctionMatchingBatchResponse {
public static final String SERIALIZED_NAME_MATCHES = "matches";
@SerializedName(SERIALIZED_NAME_MATCHES)
@javax.annotation.Nullable
- private List matches;
+ private List matches;
- public FunctionMatchingBatchResponse() {
+ public static final String SERIALIZED_NAME_NUM_MATCHES = "num_matches";
+ @SerializedName(SERIALIZED_NAME_NUM_MATCHES)
+ @javax.annotation.Nullable
+ private Integer numMatches;
+
+ public static final String SERIALIZED_NAME_NUM_DEBUG_MATCHES = "num_debug_matches";
+ @SerializedName(SERIALIZED_NAME_NUM_DEBUG_MATCHES)
+ @javax.annotation.Nullable
+ private Integer numDebugMatches;
+
+ public static final String SERIALIZED_NAME_UPDATED_AT = "updated_at";
+ @SerializedName(SERIALIZED_NAME_UPDATED_AT)
+ @javax.annotation.Nullable
+ private String updatedAt;
+
+ public FunctionMatchingResponse() {
}
- public FunctionMatchingBatchResponse progress(@javax.annotation.Nullable Integer progress) {
+ public FunctionMatchingResponse progress(@javax.annotation.Nullable Integer progress) {
this.progress = progress;
return this;
}
@@ -112,7 +127,7 @@ public void setProgress(@javax.annotation.Nullable Integer progress) {
}
- public FunctionMatchingBatchResponse status(@javax.annotation.Nullable String status) {
+ public FunctionMatchingResponse status(@javax.annotation.Nullable String status) {
this.status = status;
return this;
}
@@ -131,7 +146,7 @@ public void setStatus(@javax.annotation.Nullable String status) {
}
- public FunctionMatchingBatchResponse totalTime(@javax.annotation.Nullable Integer totalTime) {
+ public FunctionMatchingResponse totalTime(@javax.annotation.Nullable Integer totalTime) {
this.totalTime = totalTime;
return this;
}
@@ -150,7 +165,7 @@ public void setTotalTime(@javax.annotation.Nullable Integer totalTime) {
}
- public FunctionMatchingBatchResponse errorMessage(@javax.annotation.Nullable String errorMessage) {
+ public FunctionMatchingResponse errorMessage(@javax.annotation.Nullable String errorMessage) {
this.errorMessage = errorMessage;
return this;
}
@@ -169,7 +184,7 @@ public void setErrorMessage(@javax.annotation.Nullable String errorMessage) {
}
- public FunctionMatchingBatchResponse currentPage(@javax.annotation.Nullable Integer currentPage) {
+ public FunctionMatchingResponse currentPage(@javax.annotation.Nullable Integer currentPage) {
this.currentPage = currentPage;
return this;
}
@@ -188,7 +203,7 @@ public void setCurrentPage(@javax.annotation.Nullable Integer currentPage) {
}
- public FunctionMatchingBatchResponse totalPages(@javax.annotation.Nullable Integer totalPages) {
+ public FunctionMatchingResponse totalPages(@javax.annotation.Nullable Integer totalPages) {
this.totalPages = totalPages;
return this;
}
@@ -207,12 +222,12 @@ public void setTotalPages(@javax.annotation.Nullable Integer totalPages) {
}
- public FunctionMatchingBatchResponse matches(@javax.annotation.Nullable List matches) {
+ public FunctionMatchingResponse matches(@javax.annotation.Nullable List matches) {
this.matches = matches;
return this;
}
- public FunctionMatchingBatchResponse addMatchesItem(FunctionMatchingResultWithBestMatch matchesItem) {
+ public FunctionMatchingResponse addMatchesItem(FunctionMatch matchesItem) {
if (this.matches == null) {
this.matches = new ArrayList<>();
}
@@ -225,14 +240,71 @@ public FunctionMatchingBatchResponse addMatchesItem(FunctionMatchingResultWithBe
* @return matches
*/
@javax.annotation.Nullable
- public List getMatches() {
+ public List getMatches() {
return matches;
}
- public void setMatches(@javax.annotation.Nullable List matches) {
+ public void setMatches(@javax.annotation.Nullable List matches) {
this.matches = matches;
}
+
+ public FunctionMatchingResponse numMatches(@javax.annotation.Nullable Integer numMatches) {
+ this.numMatches = numMatches;
+ return this;
+ }
+
+ /**
+ * Get numMatches
+ * @return numMatches
+ */
+ @javax.annotation.Nullable
+ public Integer getNumMatches() {
+ return numMatches;
+ }
+
+ public void setNumMatches(@javax.annotation.Nullable Integer numMatches) {
+ this.numMatches = numMatches;
+ }
+
+
+ public FunctionMatchingResponse numDebugMatches(@javax.annotation.Nullable Integer numDebugMatches) {
+ this.numDebugMatches = numDebugMatches;
+ return this;
+ }
+
+ /**
+ * Get numDebugMatches
+ * @return numDebugMatches
+ */
+ @javax.annotation.Nullable
+ public Integer getNumDebugMatches() {
+ return numDebugMatches;
+ }
+
+ public void setNumDebugMatches(@javax.annotation.Nullable Integer numDebugMatches) {
+ this.numDebugMatches = numDebugMatches;
+ }
+
+
+ public FunctionMatchingResponse updatedAt(@javax.annotation.Nullable String updatedAt) {
+ this.updatedAt = updatedAt;
+ return this;
+ }
+
+ /**
+ * Get updatedAt
+ * @return updatedAt
+ */
+ @javax.annotation.Nullable
+ public String getUpdatedAt() {
+ return updatedAt;
+ }
+
+ public void setUpdatedAt(@javax.annotation.Nullable String updatedAt) {
+ this.updatedAt = updatedAt;
+ }
+
/**
* A container for additional, undeclared properties.
* This is a holder for any undeclared properties as specified with
@@ -246,9 +318,9 @@ public void setMatches(@javax.annotation.Nullable List();
}
@@ -287,15 +359,18 @@ public boolean equals(Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
- FunctionMatchingBatchResponse functionMatchingBatchResponse = (FunctionMatchingBatchResponse) o;
- return Objects.equals(this.progress, functionMatchingBatchResponse.progress) &&
- Objects.equals(this.status, functionMatchingBatchResponse.status) &&
- Objects.equals(this.totalTime, functionMatchingBatchResponse.totalTime) &&
- Objects.equals(this.errorMessage, functionMatchingBatchResponse.errorMessage) &&
- Objects.equals(this.currentPage, functionMatchingBatchResponse.currentPage) &&
- Objects.equals(this.totalPages, functionMatchingBatchResponse.totalPages) &&
- Objects.equals(this.matches, functionMatchingBatchResponse.matches)&&
- Objects.equals(this.additionalProperties, functionMatchingBatchResponse.additionalProperties);
+ FunctionMatchingResponse functionMatchingResponse = (FunctionMatchingResponse) o;
+ return Objects.equals(this.progress, functionMatchingResponse.progress) &&
+ Objects.equals(this.status, functionMatchingResponse.status) &&
+ Objects.equals(this.totalTime, functionMatchingResponse.totalTime) &&
+ Objects.equals(this.errorMessage, functionMatchingResponse.errorMessage) &&
+ Objects.equals(this.currentPage, functionMatchingResponse.currentPage) &&
+ Objects.equals(this.totalPages, functionMatchingResponse.totalPages) &&
+ Objects.equals(this.matches, functionMatchingResponse.matches) &&
+ Objects.equals(this.numMatches, functionMatchingResponse.numMatches) &&
+ Objects.equals(this.numDebugMatches, functionMatchingResponse.numDebugMatches) &&
+ Objects.equals(this.updatedAt, functionMatchingResponse.updatedAt)&&
+ Objects.equals(this.additionalProperties, functionMatchingResponse.additionalProperties);
}
private static boolean equalsNullable(JsonNullable a, JsonNullable b) {
@@ -304,7 +379,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b)
@Override
public int hashCode() {
- return Objects.hash(progress, status, totalTime, errorMessage, currentPage, totalPages, matches, additionalProperties);
+ return Objects.hash(progress, status, totalTime, errorMessage, currentPage, totalPages, matches, numMatches, numDebugMatches, updatedAt, additionalProperties);
}
private static int hashCodeNullable(JsonNullable a) {
@@ -317,7 +392,7 @@ private static int hashCodeNullable(JsonNullable a) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("class FunctionMatchingBatchResponse {\n");
+ sb.append("class FunctionMatchingResponse {\n");
sb.append(" progress: ").append(toIndentedString(progress)).append("\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append(" totalTime: ").append(toIndentedString(totalTime)).append("\n");
@@ -325,6 +400,9 @@ public String toString() {
sb.append(" currentPage: ").append(toIndentedString(currentPage)).append("\n");
sb.append(" totalPages: ").append(toIndentedString(totalPages)).append("\n");
sb.append(" matches: ").append(toIndentedString(matches)).append("\n");
+ sb.append(" numMatches: ").append(toIndentedString(numMatches)).append("\n");
+ sb.append(" numDebugMatches: ").append(toIndentedString(numDebugMatches)).append("\n");
+ sb.append(" updatedAt: ").append(toIndentedString(updatedAt)).append("\n");
sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
sb.append("}");
return sb.toString();
@@ -347,7 +425,7 @@ private String toIndentedString(Object o) {
static {
// a set of all properties/fields (JSON key names)
- openapiFields = new HashSet(Arrays.asList("progress", "status", "total_time", "error_message", "current_page", "total_pages", "matches"));
+ openapiFields = new HashSet(Arrays.asList("progress", "status", "total_time", "error_message", "current_page", "total_pages", "matches", "num_matches", "num_debug_matches", "updated_at"));
// a set of required properties/fields (JSON key names)
openapiRequiredFields = new HashSet(0);
@@ -357,12 +435,12 @@ 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 FunctionMatchingBatchResponse
+ * @throws IOException if the JSON Element is invalid with respect to FunctionMatchingResponse
*/
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
- if (!FunctionMatchingBatchResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
- throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in FunctionMatchingBatchResponse is not found in the empty JSON string", FunctionMatchingBatchResponse.openapiRequiredFields.toString()));
+ if (!FunctionMatchingResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
+ throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in FunctionMatchingResponse is not found in the empty JSON string", FunctionMatchingResponse.openapiRequiredFields.toString()));
}
}
JsonObject jsonObj = jsonElement.getAsJsonObject();
@@ -382,26 +460,29 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
// validate the optional field `matches` (array)
for (int i = 0; i < jsonArraymatches.size(); i++) {
- FunctionMatchingResultWithBestMatch.validateJsonElement(jsonArraymatches.get(i));
+ FunctionMatch.validateJsonElement(jsonArraymatches.get(i));
};
}
}
+ if ((jsonObj.get("updated_at") != null && !jsonObj.get("updated_at").isJsonNull()) && !jsonObj.get("updated_at").isJsonPrimitive()) {
+ throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `updated_at` to be a primitive type in the JSON string but got `%s`", jsonObj.get("updated_at").toString()));
+ }
}
public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
@SuppressWarnings("unchecked")
@Override
public TypeAdapter create(Gson gson, TypeToken type) {
- if (!FunctionMatchingBatchResponse.class.isAssignableFrom(type.getRawType())) {
- return null; // this class only serializes 'FunctionMatchingBatchResponse' and its subtypes
+ if (!FunctionMatchingResponse.class.isAssignableFrom(type.getRawType())) {
+ return null; // this class only serializes 'FunctionMatchingResponse' and its subtypes
}
final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class);
- final TypeAdapter thisAdapter
- = gson.getDelegateAdapter(this, TypeToken.get(FunctionMatchingBatchResponse.class));
+ final TypeAdapter thisAdapter
+ = gson.getDelegateAdapter(this, TypeToken.get(FunctionMatchingResponse.class));
- return (TypeAdapter) new TypeAdapter() {
+ return (TypeAdapter) new TypeAdapter() {
@Override
- public void write(JsonWriter out, FunctionMatchingBatchResponse value) throws IOException {
+ public void write(JsonWriter out, FunctionMatchingResponse value) throws IOException {
JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
obj.remove("additionalProperties");
// serialize additional properties
@@ -429,12 +510,12 @@ else if (entry.getValue() instanceof Character)
}
@Override
- public FunctionMatchingBatchResponse read(JsonReader in) throws IOException {
+ public FunctionMatchingResponse read(JsonReader in) throws IOException {
JsonElement jsonElement = elementAdapter.read(in);
validateJsonElement(jsonElement);
JsonObject jsonObj = jsonElement.getAsJsonObject();
// store additional fields in the deserialized instance
- FunctionMatchingBatchResponse instance = thisAdapter.fromJsonTree(jsonObj);
+ FunctionMatchingResponse instance = thisAdapter.fromJsonTree(jsonObj);
for (Map.Entry entry : jsonObj.entrySet()) {
if (!openapiFields.contains(entry.getKey())) {
if (entry.getValue().isJsonPrimitive()) { // primitive type
@@ -461,18 +542,18 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
/**
- * Create an instance of FunctionMatchingBatchResponse given an JSON string
+ * Create an instance of FunctionMatchingResponse given an JSON string
*
* @param jsonString JSON string
- * @return An instance of FunctionMatchingBatchResponse
- * @throws IOException if the JSON string is invalid with respect to FunctionMatchingBatchResponse
+ * @return An instance of FunctionMatchingResponse
+ * @throws IOException if the JSON string is invalid with respect to FunctionMatchingResponse
*/
- public static FunctionMatchingBatchResponse fromJson(String jsonString) throws IOException {
- return JSON.getGson().fromJson(jsonString, FunctionMatchingBatchResponse.class);
+ public static FunctionMatchingResponse fromJson(String jsonString) throws IOException {
+ return JSON.getGson().fromJson(jsonString, FunctionMatchingResponse.class);
}
/**
- * Convert an instance of FunctionMatchingBatchResponse to an JSON string
+ * Convert an instance of FunctionMatchingResponse to an JSON string
*
* @return JSON string
*/
diff --git a/src/main/java/ai/reveng/model/LoginRequest.java b/src/main/java/ai/reveng/model/LoginRequest.java
index e633e8e..4504a53 100644
--- a/src/main/java/ai/reveng/model/LoginRequest.java
+++ b/src/main/java/ai/reveng/model/LoginRequest.java
@@ -70,7 +70,7 @@ public LoginRequest username(@javax.annotation.Nonnull String username) {
}
/**
- * User's username
+ * User's username or email
* @return username
*/
@javax.annotation.Nonnull
diff --git a/src/test/java/ai/reveng/api/FunctionsCoreApiTest.java b/src/test/java/ai/reveng/api/FunctionsCoreApiTest.java
index 491a0d6..7fbe7be 100644
--- a/src/test/java/ai/reveng/api/FunctionsCoreApiTest.java
+++ b/src/test/java/ai/reveng/api/FunctionsCoreApiTest.java
@@ -24,8 +24,8 @@
import ai.reveng.model.BaseResponseFunctionCapabilityResponse;
import ai.reveng.model.BaseResponseFunctionStringsResponse;
import ai.reveng.model.BaseResponseFunctionsDetailResponse;
-import ai.reveng.model.FunctionMatchingBatchResponse;
import ai.reveng.model.FunctionMatchingRequest;
+import ai.reveng.model.FunctionMatchingResponse;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -68,7 +68,7 @@ public void aiUnstripTest() throws ApiException {
public void analysisFunctionMatchingTest() throws ApiException {
Integer analysisId = null;
AnalysisFunctionMatchingRequest analysisFunctionMatchingRequest = null;
- FunctionMatchingBatchResponse response = api.analysisFunctionMatching(analysisId, analysisFunctionMatchingRequest);
+ FunctionMatchingResponse response = api.analysisFunctionMatching(analysisId, analysisFunctionMatchingRequest);
// TODO: test validations
}
@@ -97,7 +97,7 @@ public void autoUnstripTest() throws ApiException {
@Test
public void batchFunctionMatchingTest() throws ApiException {
FunctionMatchingRequest functionMatchingRequest = null;
- FunctionMatchingBatchResponse response = api.batchFunctionMatching(functionMatchingRequest);
+ FunctionMatchingResponse response = api.batchFunctionMatching(functionMatchingRequest);
// TODO: test validations
}
diff --git a/src/test/java/ai/reveng/model/FunctionMatchingResultWithBestMatchTest.java b/src/test/java/ai/reveng/model/FunctionMatchTest.java
similarity index 76%
rename from src/test/java/ai/reveng/model/FunctionMatchingResultWithBestMatchTest.java
rename to src/test/java/ai/reveng/model/FunctionMatchTest.java
index d09a860..75d8557 100644
--- a/src/test/java/ai/reveng/model/FunctionMatchingResultWithBestMatchTest.java
+++ b/src/test/java/ai/reveng/model/FunctionMatchTest.java
@@ -28,17 +28,17 @@
import org.junit.jupiter.api.Test;
/**
- * Model tests for FunctionMatchingResultWithBestMatch
+ * Model tests for FunctionMatch
*/
-public class FunctionMatchingResultWithBestMatchTest {
- private final FunctionMatchingResultWithBestMatch model = new FunctionMatchingResultWithBestMatch();
+public class FunctionMatchTest {
+ private final FunctionMatch model = new FunctionMatch();
/**
- * Model tests for FunctionMatchingResultWithBestMatch
+ * Model tests for FunctionMatch
*/
@Test
- public void testFunctionMatchingResultWithBestMatch() {
- // TODO: test FunctionMatchingResultWithBestMatch
+ public void testFunctionMatch() {
+ // TODO: test FunctionMatch
}
/**
diff --git a/src/test/java/ai/reveng/model/FunctionMatchingBatchResponseTest.java b/src/test/java/ai/reveng/model/FunctionMatchingResponseTest.java
similarity index 68%
rename from src/test/java/ai/reveng/model/FunctionMatchingBatchResponseTest.java
rename to src/test/java/ai/reveng/model/FunctionMatchingResponseTest.java
index e56791b..0d16ead 100644
--- a/src/test/java/ai/reveng/model/FunctionMatchingBatchResponseTest.java
+++ b/src/test/java/ai/reveng/model/FunctionMatchingResponseTest.java
@@ -12,7 +12,7 @@
package ai.reveng.model;
-import ai.reveng.model.FunctionMatchingResultWithBestMatch;
+import ai.reveng.model.FunctionMatch;
import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
@@ -27,17 +27,17 @@
import org.junit.jupiter.api.Test;
/**
- * Model tests for FunctionMatchingBatchResponse
+ * Model tests for FunctionMatchingResponse
*/
-public class FunctionMatchingBatchResponseTest {
- private final FunctionMatchingBatchResponse model = new FunctionMatchingBatchResponse();
+public class FunctionMatchingResponseTest {
+ private final FunctionMatchingResponse model = new FunctionMatchingResponse();
/**
- * Model tests for FunctionMatchingBatchResponse
+ * Model tests for FunctionMatchingResponse
*/
@Test
- public void testFunctionMatchingBatchResponse() {
- // TODO: test FunctionMatchingBatchResponse
+ public void testFunctionMatchingResponse() {
+ // TODO: test FunctionMatchingResponse
}
/**
@@ -96,4 +96,28 @@ public void matchesTest() {
// TODO: test matches
}
+ /**
+ * Test the property 'numMatches'
+ */
+ @Test
+ public void numMatchesTest() {
+ // TODO: test numMatches
+ }
+
+ /**
+ * Test the property 'numDebugMatches'
+ */
+ @Test
+ public void numDebugMatchesTest() {
+ // TODO: test numDebugMatches
+ }
+
+ /**
+ * Test the property 'updatedAt'
+ */
+ @Test
+ public void updatedAtTest() {
+ // TODO: test updatedAt
+ }
+
}