diff --git a/.sdk-version b/.sdk-version index 9526e67..5e8f99e 100644 --- a/.sdk-version +++ b/.sdk-version @@ -1 +1 @@ -v2.74.0 +v2.75.0 diff --git a/README.md b/README.md index c11b9eb..438a8bd 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add this dependency to your project's POM: ai.reveng sdk - 2.74.0 + 2.75.0 compile ``` @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation "ai.reveng:sdk:2.74.0" + implementation "ai.reveng:sdk:2.75.0" } ``` diff --git a/build.gradle b/build.gradle index 4a5e63c..66a6568 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'ai.reveng' -version = '2.74.0' +version = '2.75.0' @@ -171,7 +171,7 @@ mavenPublishing { publishToMavenCentral(true) signAllPublications() - coordinates("ai.reveng", "sdk", "2.74.0") + coordinates("ai.reveng", "sdk", "2.75.0") pom { name = "sdk" diff --git a/build.sbt b/build.sbt index 72116c5..839858e 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.74.0", + version := "2.75.0", scalaVersion := "2.11.12", scalacOptions ++= Seq("-feature"), compile / javacOptions ++= Seq("-Xlint:deprecation"), diff --git a/docs/FunctionListItem.md b/docs/FunctionListItem.md index c5a52fb..d8e6a74 100644 --- a/docs/FunctionListItem.md +++ b/docs/FunctionListItem.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**id** | **Long** | Function id | | |**name** | **String** | Name of the function | | +|**nameSourceType** | [**NameSourceTypeEnum**](#NameSourceTypeEnum) | The source (process) the function name came from | | |**mangledName** | **String** | Mangled name of the function | | |**vaddr** | **Long** | Function virtual address | | |**size** | **Integer** | Function size in bytes | | @@ -16,3 +17,15 @@ +## Enum: NameSourceTypeEnum + +| Name | Value | +|---- | -----| +| SYSTEM | "SYSTEM" | +| USER | "USER" | +| AUTO_UNSTRIP | "AUTO_UNSTRIP" | +| EXTERNAL | "EXTERNAL" | +| AI_UNSTRIP | "AI_UNSTRIP" | + + + diff --git a/pom.xml b/pom.xml index 0d165a7..352b98b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sdk jar sdk - 2.74.0 + 2.75.0 https://github.com/RevEngAI/sdk-java Java SDK for the RevEng.AI API diff --git a/src/main/java/ai/reveng/api/AnalysesResultsMetadataApi.java b/src/main/java/ai/reveng/api/AnalysesResultsMetadataApi.java index a2aa13a..6b9a23b 100644 --- a/src/main/java/ai/reveng/api/AnalysesResultsMetadataApi.java +++ b/src/main/java/ai/reveng/api/AnalysesResultsMetadataApi.java @@ -511,7 +511,9 @@ public okhttp3.Call getCommunitiesAsync(@javax.annotation.Nonnull Integer analys 200 Successful Response - 422 Invalid request parameters - + * @deprecated */ + @Deprecated public okhttp3.Call getFunctionsListCall(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nullable String searchTerm, @javax.annotation.Nullable Integer minVAddr, @javax.annotation.Nullable Integer maxVAddr, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers @@ -569,6 +571,7 @@ public okhttp3.Call getFunctionsListCall(@javax.annotation.Nonnull Integer analy return localVarApiClient.buildCall(basePath, localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback); } + @Deprecated @SuppressWarnings("rawtypes") private okhttp3.Call getFunctionsListValidateBeforeCall(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nullable String searchTerm, @javax.annotation.Nullable Integer minVAddr, @javax.annotation.Nullable Integer maxVAddr, final ApiCallback _callback) throws ApiException { // verify the required parameter 'analysisId' is set @@ -596,7 +599,9 @@ private okhttp3.Call getFunctionsListValidateBeforeCall(@javax.annotation.Nonnul 200 Successful Response - 422 Invalid request parameters - + * @deprecated */ + @Deprecated public BaseResponseAnalysisFunctions getFunctionsList(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nullable String searchTerm, @javax.annotation.Nullable Integer minVAddr, @javax.annotation.Nullable Integer maxVAddr) throws ApiException { ApiResponse localVarResp = getFunctionsListWithHttpInfo(analysisId, searchTerm, minVAddr, maxVAddr); return localVarResp.getData(); @@ -618,7 +623,9 @@ public BaseResponseAnalysisFunctions getFunctionsList(@javax.annotation.Nonnull 200 Successful Response - 422 Invalid request parameters - + * @deprecated */ + @Deprecated public ApiResponse getFunctionsListWithHttpInfo(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nullable String searchTerm, @javax.annotation.Nullable Integer minVAddr, @javax.annotation.Nullable Integer maxVAddr) throws ApiException { okhttp3.Call localVarCall = getFunctionsListValidateBeforeCall(analysisId, searchTerm, minVAddr, maxVAddr, null); Type localVarReturnType = new TypeToken(){}.getType(); @@ -642,7 +649,9 @@ public ApiResponse getFunctionsListWithHttpInfo(@ 200 Successful Response - 422 Invalid request parameters - + * @deprecated */ + @Deprecated public okhttp3.Call getFunctionsListAsync(@javax.annotation.Nonnull Integer analysisId, @javax.annotation.Nullable String searchTerm, @javax.annotation.Nullable Integer minVAddr, @javax.annotation.Nullable Integer maxVAddr, final ApiCallback _callback) throws ApiException { okhttp3.Call localVarCall = getFunctionsListValidateBeforeCall(analysisId, searchTerm, minVAddr, maxVAddr, _callback); diff --git a/src/main/java/ai/reveng/invoker/ApiClient.java b/src/main/java/ai/reveng/invoker/ApiClient.java index fb31ff4..b01be63 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.74.0/java"); + setUserAgent("OpenAPI-Generator/2.75.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 a645d4c..eeefda3 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.74.0"; + public static final String VERSION = "2.75.0"; private static final AtomicReference defaultApiClient = new AtomicReference<>(); private static volatile Supplier apiClientFactory = ApiClient::new; diff --git a/src/main/java/ai/reveng/model/FunctionListItem.java b/src/main/java/ai/reveng/model/FunctionListItem.java index 3549399..cb5a0be 100644 --- a/src/main/java/ai/reveng/model/FunctionListItem.java +++ b/src/main/java/ai/reveng/model/FunctionListItem.java @@ -61,6 +61,69 @@ public class FunctionListItem { @javax.annotation.Nonnull private String name; + /** + * The source (process) the function name came from + */ + @JsonAdapter(NameSourceTypeEnum.Adapter.class) + public enum NameSourceTypeEnum { + SYSTEM("SYSTEM"), + + USER("USER"), + + AUTO_UNSTRIP("AUTO_UNSTRIP"), + + EXTERNAL("EXTERNAL"), + + AI_UNSTRIP("AI_UNSTRIP"); + + private String value; + + NameSourceTypeEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static NameSourceTypeEnum fromValue(String value) { + for (NameSourceTypeEnum b : NameSourceTypeEnum.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 NameSourceTypeEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public NameSourceTypeEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return NameSourceTypeEnum.fromValue(value); + } + } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + NameSourceTypeEnum.fromValue(value); + } + } + + public static final String SERIALIZED_NAME_NAME_SOURCE_TYPE = "name_source_type"; + @SerializedName(SERIALIZED_NAME_NAME_SOURCE_TYPE) + @javax.annotation.Nonnull + private NameSourceTypeEnum nameSourceType; + public static final String SERIALIZED_NAME_MANGLED_NAME = "mangled_name"; @SerializedName(SERIALIZED_NAME_MANGLED_NAME) @javax.annotation.Nonnull @@ -122,6 +185,25 @@ public void setName(@javax.annotation.Nonnull String name) { } + public FunctionListItem nameSourceType(@javax.annotation.Nonnull NameSourceTypeEnum nameSourceType) { + this.nameSourceType = nameSourceType; + return this; + } + + /** + * The source (process) the function name came from + * @return nameSourceType + */ + @javax.annotation.Nonnull + public NameSourceTypeEnum getNameSourceType() { + return nameSourceType; + } + + public void setNameSourceType(@javax.annotation.Nonnull NameSourceTypeEnum nameSourceType) { + this.nameSourceType = nameSourceType; + } + + public FunctionListItem mangledName(@javax.annotation.Nonnull String mangledName) { this.mangledName = mangledName; return this; @@ -254,6 +336,7 @@ public boolean equals(Object o) { FunctionListItem functionListItem = (FunctionListItem) o; return Objects.equals(this.id, functionListItem.id) && Objects.equals(this.name, functionListItem.name) && + Objects.equals(this.nameSourceType, functionListItem.nameSourceType) && Objects.equals(this.mangledName, functionListItem.mangledName) && Objects.equals(this.vaddr, functionListItem.vaddr) && Objects.equals(this.size, functionListItem.size) && @@ -263,7 +346,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(id, name, mangledName, vaddr, size, debug, additionalProperties); + return Objects.hash(id, name, nameSourceType, mangledName, vaddr, size, debug, additionalProperties); } @Override @@ -272,6 +355,7 @@ public String toString() { sb.append("class FunctionListItem {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" nameSourceType: ").append(toIndentedString(nameSourceType)).append("\n"); sb.append(" mangledName: ").append(toIndentedString(mangledName)).append("\n"); sb.append(" vaddr: ").append(toIndentedString(vaddr)).append("\n"); sb.append(" size: ").append(toIndentedString(size)).append("\n"); @@ -298,10 +382,10 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("id", "name", "mangled_name", "vaddr", "size", "debug")); + openapiFields = new HashSet(Arrays.asList("id", "name", "name_source_type", "mangled_name", "vaddr", "size", "debug")); // a set of required properties/fields (JSON key names) - openapiRequiredFields = new HashSet(Arrays.asList("id", "name", "mangled_name", "vaddr", "size", "debug")); + openapiRequiredFields = new HashSet(Arrays.asList("id", "name", "name_source_type", "mangled_name", "vaddr", "size", "debug")); } /** @@ -327,6 +411,11 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); } + if (!jsonObj.get("name_source_type").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `name_source_type` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name_source_type").toString())); + } + // validate the required field `name_source_type` + NameSourceTypeEnum.validateJsonElement(jsonObj.get("name_source_type")); if (!jsonObj.get("mangled_name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `mangled_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("mangled_name").toString())); } diff --git a/src/test/java/ai/reveng/model/FunctionListItemTest.java b/src/test/java/ai/reveng/model/FunctionListItemTest.java index 810e904..f8d3ef5 100644 --- a/src/test/java/ai/reveng/model/FunctionListItemTest.java +++ b/src/test/java/ai/reveng/model/FunctionListItemTest.java @@ -52,6 +52,14 @@ public void nameTest() { // TODO: test name } + /** + * Test the property 'nameSourceType' + */ + @Test + public void nameSourceTypeTest() { + // TODO: test nameSourceType + } + /** * Test the property 'mangledName' */