diff --git a/.sdk-version b/.sdk-version index c757c98..9119877 100644 --- a/.sdk-version +++ b/.sdk-version @@ -1 +1 @@ -v2.13.0 +v2.14.1 diff --git a/README.md b/README.md index b0e8f12..cfd89af 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add this dependency to your project's POM: ai.reveng sdk - 2.13.0 + 2.14.1 compile ``` @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation "ai.reveng:sdk:2.13.0" + implementation "ai.reveng:sdk:2.14.1" } ``` diff --git a/build.gradle b/build.gradle index 88beb8d..03dedde 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'ai.reveng' -version = '2.13.0' +version = '2.14.1' @@ -171,7 +171,7 @@ mavenPublishing { publishToMavenCentral(true) signAllPublications() - coordinates("ai.reveng", "sdk", "2.13.0") + coordinates("ai.reveng", "sdk", "2.14.1") pom { name = "sdk" diff --git a/build.sbt b/build.sbt index 62192f0..ed77b76 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.13.0", + version := "2.14.1", scalaVersion := "2.11.12", scalacOptions ++= Seq("-feature"), compile / javacOptions ++= Seq("-Xlint:deprecation"), @@ -15,7 +15,7 @@ lazy val root = (project in file(".")). "com.google.code.gson" % "gson" % "2.9.1", "org.apache.commons" % "commons-lang3" % "3.18.0", "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6", - "org.openapitools" % "jackson-databind-nullable" % "0.2.7", + "org.openapitools" % "jackson-databind-nullable" % "0.2.8", "io.gsonfire" % "gson-fire" % "1.9.0" % "compile", "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile", "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", diff --git a/docs/AnalysisFunctionMatchingRequest.md b/docs/AnalysisFunctionMatchingRequest.md index 0870116..370516b 100644 --- a/docs/AnalysisFunctionMatchingRequest.md +++ b/docs/AnalysisFunctionMatchingRequest.md @@ -12,6 +12,7 @@ |**resultsPerFunction** | **Integer** | Maximum number of matches to return per function, default is 1, max is 10 | [optional] | |**page** | **Integer** | Page number for paginated results, default is 1 (first page) | [optional] | |**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] | diff --git a/docs/AutoUnstripRequest.md b/docs/AutoUnstripRequest.md index cadee7f..4dd084a 100644 --- a/docs/AutoUnstripRequest.md +++ b/docs/AutoUnstripRequest.md @@ -11,6 +11,7 @@ |**apply** | **Boolean** | Whether to apply the matched function names to the target binary, default is False | [optional] | |**confidenceThreshold** | **BigDecimal** | Confidence threshold for applying function names as a percentage, default is 90 | [optional] | |**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] | diff --git a/docs/FunctionMatchingBatchResponse.md b/docs/FunctionMatchingBatchResponse.md index 1eacf78..d48f338 100644 --- a/docs/FunctionMatchingBatchResponse.md +++ b/docs/FunctionMatchingBatchResponse.md @@ -13,7 +13,7 @@ |**errorMessage** | **String** | | [optional] | |**currentPage** | **Integer** | | [optional] | |**totalPages** | **Integer** | | [optional] | -|**matches** | [**List<FunctionMatchingResultWithBestMatch>**](FunctionMatchingResultWithBestMatch.md) | | | +|**matches** | [**List<FunctionMatchingResultWithBestMatch>**](FunctionMatchingResultWithBestMatch.md) | | [optional] | diff --git a/docs/FunctionMatchingRequest.md b/docs/FunctionMatchingRequest.md index c87bd6f..ec53763 100644 --- a/docs/FunctionMatchingRequest.md +++ b/docs/FunctionMatchingRequest.md @@ -14,6 +14,7 @@ |**resultsPerFunction** | **Integer** | Maximum number of matches to return per function, default is 1, max is 50 | [optional] | |**page** | **Integer** | Page number for paginated results, default is 1 (first page) | [optional] | |**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] | diff --git a/pom.xml b/pom.xml index 8d467d7..7afa118 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sdk jar sdk - 2.13.0 + 2.14.1 https://github.com/RevEngAI/sdk-java Java SDK for the RevEng.AI API @@ -327,7 +327,7 @@ 4.12.0 2.10.1 3.18.0 - 0.2.7 + 0.2.8 1.3.5 2.0.2 5.10.3 diff --git a/src/main/java/ai/reveng/invoker/ApiClient.java b/src/main/java/ai/reveng/invoker/ApiClient.java index 16f1d2c..db6bd5b 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.13.0/java"); + setUserAgent("OpenAPI-Generator/2.14.1/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 d634ae8..f8f613a 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.13.0"; + public static final String VERSION = "2.14.1"; private static final AtomicReference defaultApiClient = new AtomicReference<>(); private static volatile Supplier apiClientFactory = ApiClient::new; diff --git a/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java b/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java index d07a422..180de6a 100644 --- a/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java +++ b/src/main/java/ai/reveng/model/AnalysisFunctionMatchingRequest.java @@ -79,6 +79,11 @@ public class AnalysisFunctionMatchingRequest { @javax.annotation.Nullable private Integer pageSize = 0; + public static final String SERIALIZED_NAME_STATUS_ONLY = "status_only"; + @SerializedName(SERIALIZED_NAME_STATUS_ONLY) + @javax.annotation.Nullable + private Boolean statusOnly = false; + public static final String SERIALIZED_NAME_NO_CACHE = "no_cache"; @SerializedName(SERIALIZED_NAME_NO_CACHE) @javax.annotation.Nullable @@ -189,6 +194,25 @@ public void setPageSize(@javax.annotation.Nullable Integer pageSize) { } + public AnalysisFunctionMatchingRequest statusOnly(@javax.annotation.Nullable Boolean statusOnly) { + this.statusOnly = statusOnly; + return this; + } + + /** + * If set to true, only returns the status of the matching operation without the actual results + * @return statusOnly + */ + @javax.annotation.Nullable + public Boolean getStatusOnly() { + return statusOnly; + } + + public void setStatusOnly(@javax.annotation.Nullable Boolean statusOnly) { + this.statusOnly = statusOnly; + } + + public AnalysisFunctionMatchingRequest noCache(@javax.annotation.Nullable Boolean noCache) { this.noCache = noCache; return this; @@ -267,6 +291,7 @@ public boolean equals(Object o) { Objects.equals(this.resultsPerFunction, analysisFunctionMatchingRequest.resultsPerFunction) && 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.additionalProperties, analysisFunctionMatchingRequest.additionalProperties); } @@ -277,7 +302,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(minSimilarity, filters, resultsPerFunction, page, pageSize, noCache, additionalProperties); + return Objects.hash(minSimilarity, filters, resultsPerFunction, page, pageSize, statusOnly, noCache, additionalProperties); } private static int hashCodeNullable(JsonNullable a) { @@ -296,6 +321,7 @@ public String toString() { sb.append(" resultsPerFunction: ").append(toIndentedString(resultsPerFunction)).append("\n"); sb.append(" page: ").append(toIndentedString(page)).append("\n"); 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(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); @@ -319,7 +345,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", "no_cache")); + openapiFields = new HashSet(Arrays.asList("min_similarity", "filters", "results_per_function", "page", "page_size", "status_only", "no_cache")); // 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 1949b6c..3cfd671 100644 --- a/src/main/java/ai/reveng/model/AutoUnstripRequest.java +++ b/src/main/java/ai/reveng/model/AutoUnstripRequest.java @@ -72,6 +72,11 @@ public class AutoUnstripRequest { @javax.annotation.Nullable private Integer minGroupSize = 10; + public static final String SERIALIZED_NAME_STATUS_ONLY = "status_only"; + @SerializedName(SERIALIZED_NAME_STATUS_ONLY) + @javax.annotation.Nullable + private Boolean statusOnly = false; + public static final String SERIALIZED_NAME_NO_CACHE = "no_cache"; @SerializedName(SERIALIZED_NAME_NO_CACHE) @javax.annotation.Nullable @@ -162,6 +167,25 @@ public void setMinGroupSize(@javax.annotation.Nullable Integer minGroupSize) { } + public AutoUnstripRequest statusOnly(@javax.annotation.Nullable Boolean statusOnly) { + this.statusOnly = statusOnly; + return this; + } + + /** + * If set to true, only returns the status of the auto-unstrip operation without the actual results + * @return statusOnly + */ + @javax.annotation.Nullable + public Boolean getStatusOnly() { + return statusOnly; + } + + public void setStatusOnly(@javax.annotation.Nullable Boolean statusOnly) { + this.statusOnly = statusOnly; + } + + public AutoUnstripRequest noCache(@javax.annotation.Nullable Boolean noCache) { this.noCache = noCache; return this; @@ -239,13 +263,14 @@ public boolean equals(Object o) { Objects.equals(this.apply, autoUnstripRequest.apply) && 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.additionalProperties, autoUnstripRequest.additionalProperties); } @Override public int hashCode() { - return Objects.hash(minSimilarity, apply, confidenceThreshold, minGroupSize, noCache, additionalProperties); + return Objects.hash(minSimilarity, apply, confidenceThreshold, minGroupSize, statusOnly, noCache, additionalProperties); } @Override @@ -256,6 +281,7 @@ public String toString() { sb.append(" apply: ").append(toIndentedString(apply)).append("\n"); sb.append(" confidenceThreshold: ").append(toIndentedString(confidenceThreshold)).append("\n"); 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(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); @@ -279,7 +305,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", "no_cache")); + openapiFields = new HashSet(Arrays.asList("min_similarity", "apply", "confidence_threshold", "min_group_size", "status_only", "no_cache")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(0); diff --git a/src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java b/src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java index f213255..f0fa76e 100644 --- a/src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java +++ b/src/main/java/ai/reveng/model/FunctionMatchingBatchResponse.java @@ -87,8 +87,8 @@ public class FunctionMatchingBatchResponse { public static final String SERIALIZED_NAME_MATCHES = "matches"; @SerializedName(SERIALIZED_NAME_MATCHES) - @javax.annotation.Nonnull - private List matches = new ArrayList<>(); + @javax.annotation.Nullable + private List matches; public FunctionMatchingBatchResponse() { } @@ -207,7 +207,7 @@ public void setTotalPages(@javax.annotation.Nullable Integer totalPages) { } - public FunctionMatchingBatchResponse matches(@javax.annotation.Nonnull List matches) { + public FunctionMatchingBatchResponse matches(@javax.annotation.Nullable List matches) { this.matches = matches; return this; } @@ -224,12 +224,12 @@ public FunctionMatchingBatchResponse addMatchesItem(FunctionMatchingResultWithBe * Get matches * @return matches */ - @javax.annotation.Nonnull + @javax.annotation.Nullable public List getMatches() { return matches; } - public void setMatches(@javax.annotation.Nonnull List matches) { + public void setMatches(@javax.annotation.Nullable List matches) { this.matches = matches; } @@ -350,7 +350,7 @@ private String toIndentedString(Object o) { openapiFields = new HashSet(Arrays.asList("progress", "status", "total_time", "error_message", "current_page", "total_pages", "matches")); // a set of required properties/fields (JSON key names) - openapiRequiredFields = new HashSet(Arrays.asList("matches")); + openapiRequiredFields = new HashSet(0); } /** @@ -365,13 +365,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti 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())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : FunctionMatchingBatchResponse.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())); - } - } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) && !jsonObj.get("status").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString())); @@ -379,16 +372,20 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("error_message") != null && !jsonObj.get("error_message").isJsonNull()) && !jsonObj.get("error_message").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `error_message` to be a primitive type in the JSON string but got `%s`", jsonObj.get("error_message").toString())); } - // ensure the json data is an array - if (!jsonObj.get("matches").isJsonArray()) { - throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `matches` to be an array in the JSON string but got `%s`", jsonObj.get("matches").toString())); + if (jsonObj.get("matches") != null && !jsonObj.get("matches").isJsonNull()) { + JsonArray jsonArraymatches = jsonObj.getAsJsonArray("matches"); + if (jsonArraymatches != null) { + // ensure the json data is an array + if (!jsonObj.get("matches").isJsonArray()) { + throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `matches` to be an array in the JSON string but got `%s`", jsonObj.get("matches").toString())); + } + + // validate the optional field `matches` (array) + for (int i = 0; i < jsonArraymatches.size(); i++) { + FunctionMatchingResultWithBestMatch.validateJsonElement(jsonArraymatches.get(i)); + }; + } } - - JsonArray jsonArraymatches = jsonObj.getAsJsonArray("matches"); - // validate the required field `matches` (array) - for (int i = 0; i < jsonArraymatches.size(); i++) { - FunctionMatchingResultWithBestMatch.validateJsonElement(jsonArraymatches.get(i)); - }; } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { diff --git a/src/main/java/ai/reveng/model/FunctionMatchingRequest.java b/src/main/java/ai/reveng/model/FunctionMatchingRequest.java index dea896e..a3164fc 100644 --- a/src/main/java/ai/reveng/model/FunctionMatchingRequest.java +++ b/src/main/java/ai/reveng/model/FunctionMatchingRequest.java @@ -91,6 +91,11 @@ public class FunctionMatchingRequest { @javax.annotation.Nullable private Integer pageSize = 0; + public static final String SERIALIZED_NAME_STATUS_ONLY = "status_only"; + @SerializedName(SERIALIZED_NAME_STATUS_ONLY) + @javax.annotation.Nullable + private Boolean statusOnly = false; + public static final String SERIALIZED_NAME_NO_CACHE = "no_cache"; @SerializedName(SERIALIZED_NAME_NO_CACHE) @javax.annotation.Nullable @@ -247,6 +252,25 @@ public void setPageSize(@javax.annotation.Nullable Integer pageSize) { } + public FunctionMatchingRequest statusOnly(@javax.annotation.Nullable Boolean statusOnly) { + this.statusOnly = statusOnly; + return this; + } + + /** + * If set to true, only returns the status of the matching operation without the actual results + * @return statusOnly + */ + @javax.annotation.Nullable + public Boolean getStatusOnly() { + return statusOnly; + } + + public void setStatusOnly(@javax.annotation.Nullable Boolean statusOnly) { + this.statusOnly = statusOnly; + } + + public FunctionMatchingRequest noCache(@javax.annotation.Nullable Boolean noCache) { this.noCache = noCache; return this; @@ -327,6 +351,7 @@ public boolean equals(Object o) { Objects.equals(this.resultsPerFunction, functionMatchingRequest.resultsPerFunction) && 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.additionalProperties, functionMatchingRequest.additionalProperties); } @@ -337,7 +362,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(modelId, functionIds, minSimilarity, filters, resultsPerFunction, page, pageSize, noCache, additionalProperties); + return Objects.hash(modelId, functionIds, minSimilarity, filters, resultsPerFunction, page, pageSize, statusOnly, noCache, additionalProperties); } private static int hashCodeNullable(JsonNullable a) { @@ -358,6 +383,7 @@ public String toString() { sb.append(" resultsPerFunction: ").append(toIndentedString(resultsPerFunction)).append("\n"); sb.append(" page: ").append(toIndentedString(page)).append("\n"); 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(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); @@ -381,7 +407,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", "no_cache")); + openapiFields = new HashSet(Arrays.asList("model_id", "function_ids", "min_similarity", "filters", "results_per_function", "page", "page_size", "status_only", "no_cache")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(Arrays.asList("model_id", "function_ids")); diff --git a/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java b/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java index 88c9a54..f4e942c 100644 --- a/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java +++ b/src/test/java/ai/reveng/model/AnalysisFunctionMatchingRequestTest.java @@ -79,6 +79,14 @@ public void pageSizeTest() { // TODO: test pageSize } + /** + * Test the property 'statusOnly' + */ + @Test + public void statusOnlyTest() { + // TODO: test statusOnly + } + /** * Test the property 'noCache' */ diff --git a/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java b/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java index 6af19b7..d624d6c 100644 --- a/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java +++ b/src/test/java/ai/reveng/model/AutoUnstripRequestTest.java @@ -69,6 +69,14 @@ public void minGroupSizeTest() { // TODO: test minGroupSize } + /** + * Test the property 'statusOnly' + */ + @Test + public void statusOnlyTest() { + // TODO: test statusOnly + } + /** * Test the property 'noCache' */ diff --git a/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java b/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java index 50599d2..0b378a9 100644 --- a/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java +++ b/src/test/java/ai/reveng/model/FunctionMatchingRequestTest.java @@ -97,6 +97,14 @@ public void pageSizeTest() { // TODO: test pageSize } + /** + * Test the property 'statusOnly' + */ + @Test + public void statusOnlyTest() { + // TODO: test statusOnly + } + /** * Test the property 'noCache' */