diff --git a/.sdk-version b/.sdk-version index b936018..6110fbd 100644 --- a/.sdk-version +++ b/.sdk-version @@ -1 +1 @@ -v1.96.1 +v1.98.0 diff --git a/README.md b/README.md index 68a921c..9f9c102 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add this dependency to your project's POM: ai.reveng sdk - 1.96.1 + 1.98.0 compile ``` @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation "ai.reveng:sdk:1.96.1" + implementation "ai.reveng:sdk:1.98.0" } ``` diff --git a/build.gradle b/build.gradle index 74fe37b..da4e855 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'ai.reveng' -version = '1.96.1' +version = '1.98.0' @@ -171,7 +171,7 @@ mavenPublishing { publishToMavenCentral(true) signAllPublications() - coordinates("ai.reveng", "sdk", "1.96.1") + coordinates("ai.reveng", "sdk", "1.98.0") pom { name = "sdk" diff --git a/build.sbt b/build.sbt index e75f75c..6d1b851 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "ai.reveng", name := "sdk", - version := "1.96.1", + version := "1.98.0", scalaVersion := "2.11.12", scalacOptions ++= Seq("-feature"), compile / javacOptions ++= Seq("-Xlint:deprecation"), diff --git a/docs/AnalysisRecord.md b/docs/AnalysisRecord.md index e4fc5c3..c9ff609 100644 --- a/docs/AnalysisRecord.md +++ b/docs/AnalysisRecord.md @@ -13,7 +13,7 @@ |**modelId** | **Integer** | ID to identify the model used for analysis | | |**modelName** | **String** | Name of the model used for analysis | | |**status** | **String** | The current status of analysis | | -|**creation** | **OffsetDateTime** | The current status of analysis | | +|**creation** | **java.time.Instant** | The current status of analysis | | |**isOwner** | **Boolean** | Whether the current user is the owner of a binary | | |**binaryName** | **String** | The name of the file uploaded | | |**sha256Hash** | **String** | The hash of the binary | | diff --git a/docs/Basic.md b/docs/Basic.md index bc48866..3391480 100644 --- a/docs/Basic.md +++ b/docs/Basic.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**binaryName** | **String** | The name of the binary uploaded | | |**binarySize** | **Integer** | The size of the binary uploaded (bytes) | | -|**creation** | **OffsetDateTime** | When the binary was uploaded | | +|**creation** | **java.time.Instant** | When the binary was uploaded | | |**sha256Hash** | **String** | The hash of the binary uploaded | | |**modelName** | **String** | The model name used for analysis | | |**ownerUsername** | **String** | The name of the owner of the binary | | diff --git a/docs/BinaryAdditionalResponse.md b/docs/BinaryAdditionalResponse.md index ab8e5ef..a6065ba 100644 --- a/docs/BinaryAdditionalResponse.md +++ b/docs/BinaryAdditionalResponse.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**binaryId** | **Integer** | | | |**details** | [**BinaryAdditionalDetailsDataResponse**](BinaryAdditionalDetailsDataResponse.md) | | | -|**creation** | **OffsetDateTime** | | [optional] | +|**creation** | **java.time.Instant** | | [optional] | diff --git a/docs/BinaryDetailsResponse.md b/docs/BinaryDetailsResponse.md index 5f3efbd..1697ac2 100644 --- a/docs/BinaryDetailsResponse.md +++ b/docs/BinaryDetailsResponse.md @@ -26,7 +26,7 @@ |**tlsh** | **String** | | | |**type** | **String** | | | |**debug** | **Boolean** | | | -|**firstSeen** | **OffsetDateTime** | | | +|**firstSeen** | **java.time.Instant** | | | diff --git a/docs/BinaryExternalsResponse.md b/docs/BinaryExternalsResponse.md index b158ad1..bab6f18 100644 --- a/docs/BinaryExternalsResponse.md +++ b/docs/BinaryExternalsResponse.md @@ -9,9 +9,9 @@ |------------ | ------------- | ------------- | -------------| |**sha256Hash** | **String** | SHA256 hash of the binary | | |**vt** | **Map<String, Object>** | VirusTotal information | | -|**vtLastUpdated** | **OffsetDateTime** | VirusTotal last updated date | | +|**vtLastUpdated** | **java.time.Instant** | VirusTotal last updated date | | |**mb** | **Map<String, Object>** | MalwareBazaar information | | -|**mbLastUpdated** | **OffsetDateTime** | MalwareBazaar last updated date | | +|**mbLastUpdated** | **java.time.Instant** | MalwareBazaar last updated date | | diff --git a/docs/BinarySearchResult.md b/docs/BinarySearchResult.md index 2770092..d4194d5 100644 --- a/docs/BinarySearchResult.md +++ b/docs/BinarySearchResult.md @@ -12,7 +12,7 @@ |**analysisId** | **Integer** | The analysis ID | | |**sha256Hash** | **String** | The SHA-256 hash of the binary | | |**tags** | **List<String>** | | | -|**createdAt** | **OffsetDateTime** | The creation date of the binary | | +|**createdAt** | **java.time.Instant** | The creation date of the binary | | |**modelId** | **Integer** | The model ID of the binary | | |**modelName** | **String** | The name of the model | | |**ownedBy** | **String** | The owner of the binary | | diff --git a/docs/CollectionBinaryResponse.md b/docs/CollectionBinaryResponse.md index 3293ef0..7667a4e 100644 --- a/docs/CollectionBinaryResponse.md +++ b/docs/CollectionBinaryResponse.md @@ -12,7 +12,7 @@ |**binaryName** | **String** | Binary name | | |**ownerId** | **Integer** | Binary owner | | |**sha256Hash** | **String** | Binary SHA-256 hash | | -|**createdAt** | **OffsetDateTime** | Binary creation date | | +|**createdAt** | **java.time.Instant** | Binary creation date | | diff --git a/docs/CollectionListItem.md b/docs/CollectionListItem.md index ea39d06..b31d36a 100644 --- a/docs/CollectionListItem.md +++ b/docs/CollectionListItem.md @@ -15,7 +15,7 @@ |**collectionTags** | **List<String>** | The tags of the collection | [optional] | |**collectionSize** | **Integer** | The size of the collection | | |**collectionId** | **Integer** | The ID of the collection | | -|**creation** | **OffsetDateTime** | The current status of analysis | | +|**creation** | **java.time.Instant** | The current status of analysis | | |**modelName** | **String** | The model being used for the collection | | |**teamId** | **Integer** | | [optional] | diff --git a/docs/CollectionResponse.md b/docs/CollectionResponse.md index c87011e..ec4eb04 100644 --- a/docs/CollectionResponse.md +++ b/docs/CollectionResponse.md @@ -14,8 +14,8 @@ |**userId** | **Integer** | Collection user ID | | |**teamId** | **Integer** | | [optional] | |**collectionScope** | **CollectionScope** | Collection public status | | -|**createdAt** | **OffsetDateTime** | Collection creation date | | -|**updatedAt** | **OffsetDateTime** | Collection last update date | | +|**createdAt** | **java.time.Instant** | Collection creation date | | +|**updatedAt** | **java.time.Instant** | Collection last update date | | |**tags** | **List<String>** | | [optional] | |**binaries** | [**List<CollectionResponseBinariesInner>**](CollectionResponseBinariesInner.md) | | [optional] | diff --git a/docs/CollectionResponseBinariesInner.md b/docs/CollectionResponseBinariesInner.md index 7978bba..c34741c 100644 --- a/docs/CollectionResponseBinariesInner.md +++ b/docs/CollectionResponseBinariesInner.md @@ -12,7 +12,7 @@ |**binaryName** | **String** | Binary name | | |**ownerId** | **Integer** | Binary owner | | |**sha256Hash** | **String** | Binary SHA-256 hash | | -|**createdAt** | **OffsetDateTime** | Binary creation date | | +|**createdAt** | **java.time.Instant** | Binary creation date | | diff --git a/docs/CollectionSearchResult.md b/docs/CollectionSearchResult.md index 67e3310..2648ebc 100644 --- a/docs/CollectionSearchResult.md +++ b/docs/CollectionSearchResult.md @@ -10,8 +10,8 @@ |**collectionId** | **Integer** | The ID of the collection | | |**collectionName** | **String** | The name of the collection | | |**scope** | **String** | The scope of the collection | | -|**lastUpdatedAt** | **OffsetDateTime** | The last update date of the collection | | -|**createdAt** | **OffsetDateTime** | The creation date of the collection | | +|**lastUpdatedAt** | **java.time.Instant** | The last update date of the collection | | +|**createdAt** | **java.time.Instant** | The creation date of the collection | | |**modelId** | **Integer** | The model ID of the binary | | |**modelName** | **String** | The name of the model | | |**ownedBy** | **String** | The owner of the collection | | diff --git a/docs/CommentResponse.md b/docs/CommentResponse.md index 8f3b957..d9fff6c 100644 --- a/docs/CommentResponse.md +++ b/docs/CommentResponse.md @@ -13,8 +13,8 @@ |**resourceType** | **String** | | | |**resourceId** | **String** | | | |**context** | [**Context**](Context.md) | | [optional] | -|**createdAt** | **OffsetDateTime** | | | -|**updatedAt** | **OffsetDateTime** | | | +|**createdAt** | **java.time.Instant** | | | +|**updatedAt** | **java.time.Instant** | | | diff --git a/docs/ExternalResponse.md b/docs/ExternalResponse.md index 9b65c9b..65f4b03 100644 --- a/docs/ExternalResponse.md +++ b/docs/ExternalResponse.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**sha256Hash** | **String** | | | |**data** | **Map<String, Object>** | | | -|**lastUpdated** | **OffsetDateTime** | | | +|**lastUpdated** | **java.time.Instant** | | | diff --git a/docs/FunctionSearchResult.md b/docs/FunctionSearchResult.md index a1578fb..6349e6f 100644 --- a/docs/FunctionSearchResult.md +++ b/docs/FunctionSearchResult.md @@ -10,7 +10,7 @@ |**functionId** | **Integer** | The function ID | | |**functionName** | **String** | The name of the function | | |**binaryName** | **String** | The name of the binary the function belongs to | | -|**createdAt** | **OffsetDateTime** | The creation date of the function | | +|**createdAt** | **java.time.Instant** | The creation date of the function | | |**modelId** | **Integer** | The model ID used to analyze the binary the function belongs to | | |**modelName** | **String** | The name of the model used to analyze the binary the function belongs to | | |**ownedBy** | **String** | The owner of the binary the function belongs to | | diff --git a/docs/GetUserResponse.md b/docs/GetUserResponse.md index a129185..5c79096 100644 --- a/docs/GetUserResponse.md +++ b/docs/GetUserResponse.md @@ -12,7 +12,7 @@ |**firstName** | **String** | | | |**lastName** | **String** | | | |**email** | **String** | | | -|**creation** | **OffsetDateTime** | | | +|**creation** | **java.time.Instant** | | | |**tutorialSeen** | **Boolean** | | | diff --git a/docs/MatchedFunctionSuggestion.md b/docs/MatchedFunctionSuggestion.md index 7258fc5..57ef7ae 100644 --- a/docs/MatchedFunctionSuggestion.md +++ b/docs/MatchedFunctionSuggestion.md @@ -9,7 +9,8 @@ |------------ | ------------- | ------------- | -------------| |**functionId** | **Integer** | Unique identifier of the matched function | | |**functionVaddr** | **Integer** | Virtual address of the matched function | | -|**suggestedName** | **String** | Name of the function group that contains the matched functions | | +|**suggestedName** | **String** | | [optional] | +|**suggestedDemangledName** | **String** | De-mangled name of the function group that contains the matched functions | | diff --git a/docs/UserActivityResponse.md b/docs/UserActivityResponse.md index 6520d5d..d61a705 100644 --- a/docs/UserActivityResponse.md +++ b/docs/UserActivityResponse.md @@ -9,7 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**actions** | **String** | | | |**activityScope** | **String** | | | -|**creation** | **OffsetDateTime** | | | +|**creation** | **java.time.Instant** | | | |**message** | **String** | | | |**sources** | **String** | | | |**username** | **String** | | | diff --git a/pom.xml b/pom.xml index 2a42ad7..5a2b9a2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sdk jar sdk - 1.96.1 + 1.98.0 https://github.com/RevEngAI/sdk-java Java SDK for the RevEng.AI API diff --git a/src/main/java/ai/reveng/invoker/ApiClient.java b/src/main/java/ai/reveng/invoker/ApiClient.java index d49a9e8..e09bdf4 100644 --- a/src/main/java/ai/reveng/invoker/ApiClient.java +++ b/src/main/java/ai/reveng/invoker/ApiClient.java @@ -140,7 +140,7 @@ protected void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/1.96.1/java"); + setUserAgent("OpenAPI-Generator/1.98.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 c5026c5..fe1fc8d 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 = "1.96.1"; + public static final String VERSION = "1.98.0"; private static final AtomicReference defaultApiClient = new AtomicReference<>(); private static volatile Supplier apiClientFactory = ApiClient::new; diff --git a/src/main/java/ai/reveng/model/AnalysisRecord.java b/src/main/java/ai/reveng/model/AnalysisRecord.java index 29ae260..de65122 100644 --- a/src/main/java/ai/reveng/model/AnalysisRecord.java +++ b/src/main/java/ai/reveng/model/AnalysisRecord.java @@ -21,7 +21,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.openapitools.jackson.nullable.JsonNullable; @@ -87,7 +86,7 @@ public class AnalysisRecord { public static final String SERIALIZED_NAME_CREATION = "creation"; @SerializedName(SERIALIZED_NAME_CREATION) @javax.annotation.Nonnull - private OffsetDateTime creation; + private java.time.Instant creation; public static final String SERIALIZED_NAME_IS_OWNER = "is_owner"; @SerializedName(SERIALIZED_NAME_IS_OWNER) @@ -251,7 +250,7 @@ public void setStatus(@javax.annotation.Nonnull String status) { } - public AnalysisRecord creation(@javax.annotation.Nonnull OffsetDateTime creation) { + public AnalysisRecord creation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; return this; } @@ -261,11 +260,11 @@ public AnalysisRecord creation(@javax.annotation.Nonnull OffsetDateTime creation * @return creation */ @javax.annotation.Nonnull - public OffsetDateTime getCreation() { + public java.time.Instant getCreation() { return creation; } - public void setCreation(@javax.annotation.Nonnull OffsetDateTime creation) { + public void setCreation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; } diff --git a/src/main/java/ai/reveng/model/Basic.java b/src/main/java/ai/reveng/model/Basic.java index 300d767..55a94c6 100644 --- a/src/main/java/ai/reveng/model/Basic.java +++ b/src/main/java/ai/reveng/model/Basic.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import com.google.gson.Gson; @@ -65,7 +64,7 @@ public class Basic { public static final String SERIALIZED_NAME_CREATION = "creation"; @SerializedName(SERIALIZED_NAME_CREATION) @javax.annotation.Nonnull - private OffsetDateTime creation; + private java.time.Instant creation; public static final String SERIALIZED_NAME_SHA256_HASH = "sha_256_hash"; @SerializedName(SERIALIZED_NAME_SHA256_HASH) @@ -153,7 +152,7 @@ public void setBinarySize(@javax.annotation.Nonnull Integer binarySize) { } - public Basic creation(@javax.annotation.Nonnull OffsetDateTime creation) { + public Basic creation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; return this; } @@ -163,11 +162,11 @@ public Basic creation(@javax.annotation.Nonnull OffsetDateTime creation) { * @return creation */ @javax.annotation.Nonnull - public OffsetDateTime getCreation() { + public java.time.Instant getCreation() { return creation; } - public void setCreation(@javax.annotation.Nonnull OffsetDateTime creation) { + public void setCreation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; } diff --git a/src/main/java/ai/reveng/model/BinaryAdditionalResponse.java b/src/main/java/ai/reveng/model/BinaryAdditionalResponse.java index 6c8e64d..28d55e9 100644 --- a/src/main/java/ai/reveng/model/BinaryAdditionalResponse.java +++ b/src/main/java/ai/reveng/model/BinaryAdditionalResponse.java @@ -21,7 +21,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.openapitools.jackson.nullable.JsonNullable; @@ -67,7 +66,7 @@ public class BinaryAdditionalResponse { public static final String SERIALIZED_NAME_CREATION = "creation"; @SerializedName(SERIALIZED_NAME_CREATION) @javax.annotation.Nullable - private OffsetDateTime creation; + private java.time.Instant creation; public BinaryAdditionalResponse() { } @@ -110,7 +109,7 @@ public void setDetails(@javax.annotation.Nullable BinaryAdditionalDetailsDataRes } - public BinaryAdditionalResponse creation(@javax.annotation.Nullable OffsetDateTime creation) { + public BinaryAdditionalResponse creation(@javax.annotation.Nullable java.time.Instant creation) { this.creation = creation; return this; } @@ -120,11 +119,11 @@ public BinaryAdditionalResponse creation(@javax.annotation.Nullable OffsetDateTi * @return creation */ @javax.annotation.Nullable - public OffsetDateTime getCreation() { + public java.time.Instant getCreation() { return creation; } - public void setCreation(@javax.annotation.Nullable OffsetDateTime creation) { + public void setCreation(@javax.annotation.Nullable java.time.Instant creation) { this.creation = creation; } diff --git a/src/main/java/ai/reveng/model/BinaryDetailsResponse.java b/src/main/java/ai/reveng/model/BinaryDetailsResponse.java index 198d65a..62c2f6e 100644 --- a/src/main/java/ai/reveng/model/BinaryDetailsResponse.java +++ b/src/main/java/ai/reveng/model/BinaryDetailsResponse.java @@ -21,7 +21,6 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.util.Arrays; import com.google.gson.Gson; @@ -151,7 +150,7 @@ public class BinaryDetailsResponse { public static final String SERIALIZED_NAME_FIRST_SEEN = "first_seen"; @SerializedName(SERIALIZED_NAME_FIRST_SEEN) @javax.annotation.Nonnull - private OffsetDateTime firstSeen; + private java.time.Instant firstSeen; public BinaryDetailsResponse() { } @@ -517,7 +516,7 @@ public void setDebug(@javax.annotation.Nonnull Boolean debug) { } - public BinaryDetailsResponse firstSeen(@javax.annotation.Nonnull OffsetDateTime firstSeen) { + public BinaryDetailsResponse firstSeen(@javax.annotation.Nonnull java.time.Instant firstSeen) { this.firstSeen = firstSeen; return this; } @@ -527,11 +526,11 @@ public BinaryDetailsResponse firstSeen(@javax.annotation.Nonnull OffsetDateTime * @return firstSeen */ @javax.annotation.Nonnull - public OffsetDateTime getFirstSeen() { + public java.time.Instant getFirstSeen() { return firstSeen; } - public void setFirstSeen(@javax.annotation.Nonnull OffsetDateTime firstSeen) { + public void setFirstSeen(@javax.annotation.Nonnull java.time.Instant firstSeen) { this.firstSeen = firstSeen; } diff --git a/src/main/java/ai/reveng/model/BinaryExternalsResponse.java b/src/main/java/ai/reveng/model/BinaryExternalsResponse.java index 26d698c..b438d28 100644 --- a/src/main/java/ai/reveng/model/BinaryExternalsResponse.java +++ b/src/main/java/ai/reveng/model/BinaryExternalsResponse.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -67,7 +66,7 @@ public class BinaryExternalsResponse { public static final String SERIALIZED_NAME_VT_LAST_UPDATED = "vt_last_updated"; @SerializedName(SERIALIZED_NAME_VT_LAST_UPDATED) @javax.annotation.Nonnull - private OffsetDateTime vtLastUpdated; + private java.time.Instant vtLastUpdated; public static final String SERIALIZED_NAME_MB = "mb"; @SerializedName(SERIALIZED_NAME_MB) @@ -77,7 +76,7 @@ public class BinaryExternalsResponse { public static final String SERIALIZED_NAME_MB_LAST_UPDATED = "mb_last_updated"; @SerializedName(SERIALIZED_NAME_MB_LAST_UPDATED) @javax.annotation.Nonnull - private OffsetDateTime mbLastUpdated; + private java.time.Instant mbLastUpdated; public BinaryExternalsResponse() { } @@ -128,7 +127,7 @@ public void setVt(@javax.annotation.Nonnull Map vt) { } - public BinaryExternalsResponse vtLastUpdated(@javax.annotation.Nonnull OffsetDateTime vtLastUpdated) { + public BinaryExternalsResponse vtLastUpdated(@javax.annotation.Nonnull java.time.Instant vtLastUpdated) { this.vtLastUpdated = vtLastUpdated; return this; } @@ -138,11 +137,11 @@ public BinaryExternalsResponse vtLastUpdated(@javax.annotation.Nonnull OffsetDat * @return vtLastUpdated */ @javax.annotation.Nonnull - public OffsetDateTime getVtLastUpdated() { + public java.time.Instant getVtLastUpdated() { return vtLastUpdated; } - public void setVtLastUpdated(@javax.annotation.Nonnull OffsetDateTime vtLastUpdated) { + public void setVtLastUpdated(@javax.annotation.Nonnull java.time.Instant vtLastUpdated) { this.vtLastUpdated = vtLastUpdated; } @@ -174,7 +173,7 @@ public void setMb(@javax.annotation.Nonnull Map mb) { } - public BinaryExternalsResponse mbLastUpdated(@javax.annotation.Nonnull OffsetDateTime mbLastUpdated) { + public BinaryExternalsResponse mbLastUpdated(@javax.annotation.Nonnull java.time.Instant mbLastUpdated) { this.mbLastUpdated = mbLastUpdated; return this; } @@ -184,11 +183,11 @@ public BinaryExternalsResponse mbLastUpdated(@javax.annotation.Nonnull OffsetDat * @return mbLastUpdated */ @javax.annotation.Nonnull - public OffsetDateTime getMbLastUpdated() { + public java.time.Instant getMbLastUpdated() { return mbLastUpdated; } - public void setMbLastUpdated(@javax.annotation.Nonnull OffsetDateTime mbLastUpdated) { + public void setMbLastUpdated(@javax.annotation.Nonnull java.time.Instant mbLastUpdated) { this.mbLastUpdated = mbLastUpdated; } diff --git a/src/main/java/ai/reveng/model/BinarySearchResult.java b/src/main/java/ai/reveng/model/BinarySearchResult.java index c1bc1fb..4b5588d 100644 --- a/src/main/java/ai/reveng/model/BinarySearchResult.java +++ b/src/main/java/ai/reveng/model/BinarySearchResult.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -82,7 +81,7 @@ public class BinarySearchResult { public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) @javax.annotation.Nonnull - private OffsetDateTime createdAt; + private java.time.Instant createdAt; public static final String SERIALIZED_NAME_MODEL_ID = "model_id"; @SerializedName(SERIALIZED_NAME_MODEL_ID) @@ -205,7 +204,7 @@ public void setTags(@javax.annotation.Nullable List tags) { } - public BinarySearchResult createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public BinarySearchResult createdAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; return this; } @@ -215,11 +214,11 @@ public BinarySearchResult createdAt(@javax.annotation.Nonnull OffsetDateTime cre * @return createdAt */ @javax.annotation.Nonnull - public OffsetDateTime getCreatedAt() { + public java.time.Instant getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; } diff --git a/src/main/java/ai/reveng/model/CollectionBinaryResponse.java b/src/main/java/ai/reveng/model/CollectionBinaryResponse.java index 5bc3963..e33b319 100644 --- a/src/main/java/ai/reveng/model/CollectionBinaryResponse.java +++ b/src/main/java/ai/reveng/model/CollectionBinaryResponse.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import com.google.gson.Gson; @@ -80,7 +79,7 @@ public class CollectionBinaryResponse { public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) @javax.annotation.Nonnull - private OffsetDateTime createdAt; + private java.time.Instant createdAt; public CollectionBinaryResponse() { } @@ -180,7 +179,7 @@ public void setSha256Hash(@javax.annotation.Nonnull String sha256Hash) { } - public CollectionBinaryResponse createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public CollectionBinaryResponse createdAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; return this; } @@ -190,11 +189,11 @@ public CollectionBinaryResponse createdAt(@javax.annotation.Nonnull OffsetDateTi * @return createdAt */ @javax.annotation.Nonnull - public OffsetDateTime getCreatedAt() { + public java.time.Instant getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; } diff --git a/src/main/java/ai/reveng/model/CollectionListItem.java b/src/main/java/ai/reveng/model/CollectionListItem.java index 2a7b528..2833d7d 100644 --- a/src/main/java/ai/reveng/model/CollectionListItem.java +++ b/src/main/java/ai/reveng/model/CollectionListItem.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -98,7 +97,7 @@ public class CollectionListItem { public static final String SERIALIZED_NAME_CREATION = "creation"; @SerializedName(SERIALIZED_NAME_CREATION) @javax.annotation.Nonnull - private OffsetDateTime creation; + private java.time.Instant creation; public static final String SERIALIZED_NAME_MODEL_NAME = "model_name"; @SerializedName(SERIALIZED_NAME_MODEL_NAME) @@ -273,7 +272,7 @@ public void setCollectionId(@javax.annotation.Nonnull Integer collectionId) { } - public CollectionListItem creation(@javax.annotation.Nonnull OffsetDateTime creation) { + public CollectionListItem creation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; return this; } @@ -283,11 +282,11 @@ public CollectionListItem creation(@javax.annotation.Nonnull OffsetDateTime crea * @return creation */ @javax.annotation.Nonnull - public OffsetDateTime getCreation() { + public java.time.Instant getCreation() { return creation; } - public void setCreation(@javax.annotation.Nonnull OffsetDateTime creation) { + public void setCreation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; } diff --git a/src/main/java/ai/reveng/model/CollectionResponse.java b/src/main/java/ai/reveng/model/CollectionResponse.java index f3582bd..2822d57 100644 --- a/src/main/java/ai/reveng/model/CollectionResponse.java +++ b/src/main/java/ai/reveng/model/CollectionResponse.java @@ -22,7 +22,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -95,12 +94,12 @@ public class CollectionResponse { public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) @javax.annotation.Nonnull - private OffsetDateTime createdAt; + private java.time.Instant createdAt; public static final String SERIALIZED_NAME_UPDATED_AT = "updated_at"; @SerializedName(SERIALIZED_NAME_UPDATED_AT) @javax.annotation.Nonnull - private OffsetDateTime updatedAt; + private java.time.Instant updatedAt; public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -248,7 +247,7 @@ public void setCollectionScope(@javax.annotation.Nonnull CollectionScope collect } - public CollectionResponse createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public CollectionResponse createdAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; return this; } @@ -258,16 +257,16 @@ public CollectionResponse createdAt(@javax.annotation.Nonnull OffsetDateTime cre * @return createdAt */ @javax.annotation.Nonnull - public OffsetDateTime getCreatedAt() { + public java.time.Instant getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; } - public CollectionResponse updatedAt(@javax.annotation.Nonnull OffsetDateTime updatedAt) { + public CollectionResponse updatedAt(@javax.annotation.Nonnull java.time.Instant updatedAt) { this.updatedAt = updatedAt; return this; } @@ -277,11 +276,11 @@ public CollectionResponse updatedAt(@javax.annotation.Nonnull OffsetDateTime upd * @return updatedAt */ @javax.annotation.Nonnull - public OffsetDateTime getUpdatedAt() { + public java.time.Instant getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(@javax.annotation.Nonnull OffsetDateTime updatedAt) { + public void setUpdatedAt(@javax.annotation.Nonnull java.time.Instant updatedAt) { this.updatedAt = updatedAt; } diff --git a/src/main/java/ai/reveng/model/CollectionResponseBinariesInner.java b/src/main/java/ai/reveng/model/CollectionResponseBinariesInner.java index 7b5b0a0..6716d52 100644 --- a/src/main/java/ai/reveng/model/CollectionResponseBinariesInner.java +++ b/src/main/java/ai/reveng/model/CollectionResponseBinariesInner.java @@ -21,7 +21,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; diff --git a/src/main/java/ai/reveng/model/CollectionSearchResult.java b/src/main/java/ai/reveng/model/CollectionSearchResult.java index 4596d77..237411f 100644 --- a/src/main/java/ai/reveng/model/CollectionSearchResult.java +++ b/src/main/java/ai/reveng/model/CollectionSearchResult.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -73,12 +72,12 @@ public class CollectionSearchResult { public static final String SERIALIZED_NAME_LAST_UPDATED_AT = "last_updated_at"; @SerializedName(SERIALIZED_NAME_LAST_UPDATED_AT) @javax.annotation.Nonnull - private OffsetDateTime lastUpdatedAt; + private java.time.Instant lastUpdatedAt; public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) @javax.annotation.Nonnull - private OffsetDateTime createdAt; + private java.time.Instant createdAt; public static final String SERIALIZED_NAME_MODEL_ID = "model_id"; @SerializedName(SERIALIZED_NAME_MODEL_ID) @@ -175,7 +174,7 @@ public void setScope(@javax.annotation.Nonnull String scope) { } - public CollectionSearchResult lastUpdatedAt(@javax.annotation.Nonnull OffsetDateTime lastUpdatedAt) { + public CollectionSearchResult lastUpdatedAt(@javax.annotation.Nonnull java.time.Instant lastUpdatedAt) { this.lastUpdatedAt = lastUpdatedAt; return this; } @@ -185,16 +184,16 @@ public CollectionSearchResult lastUpdatedAt(@javax.annotation.Nonnull OffsetDate * @return lastUpdatedAt */ @javax.annotation.Nonnull - public OffsetDateTime getLastUpdatedAt() { + public java.time.Instant getLastUpdatedAt() { return lastUpdatedAt; } - public void setLastUpdatedAt(@javax.annotation.Nonnull OffsetDateTime lastUpdatedAt) { + public void setLastUpdatedAt(@javax.annotation.Nonnull java.time.Instant lastUpdatedAt) { this.lastUpdatedAt = lastUpdatedAt; } - public CollectionSearchResult createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public CollectionSearchResult createdAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; return this; } @@ -204,11 +203,11 @@ public CollectionSearchResult createdAt(@javax.annotation.Nonnull OffsetDateTime * @return createdAt */ @javax.annotation.Nonnull - public OffsetDateTime getCreatedAt() { + public java.time.Instant getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; } diff --git a/src/main/java/ai/reveng/model/CommentResponse.java b/src/main/java/ai/reveng/model/CommentResponse.java index 857c9bc..b7f19dc 100644 --- a/src/main/java/ai/reveng/model/CommentResponse.java +++ b/src/main/java/ai/reveng/model/CommentResponse.java @@ -21,7 +21,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.openapitools.jackson.nullable.JsonNullable; @@ -87,12 +86,12 @@ public class CommentResponse { public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) @javax.annotation.Nonnull - private OffsetDateTime createdAt; + private java.time.Instant createdAt; public static final String SERIALIZED_NAME_UPDATED_AT = "updated_at"; @SerializedName(SERIALIZED_NAME_UPDATED_AT) @javax.annotation.Nonnull - private OffsetDateTime updatedAt; + private java.time.Instant updatedAt; public CommentResponse() { } @@ -211,7 +210,7 @@ public void setContext(@javax.annotation.Nullable Context context) { } - public CommentResponse createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public CommentResponse createdAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; return this; } @@ -221,16 +220,16 @@ public CommentResponse createdAt(@javax.annotation.Nonnull OffsetDateTime create * @return createdAt */ @javax.annotation.Nonnull - public OffsetDateTime getCreatedAt() { + public java.time.Instant getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; } - public CommentResponse updatedAt(@javax.annotation.Nonnull OffsetDateTime updatedAt) { + public CommentResponse updatedAt(@javax.annotation.Nonnull java.time.Instant updatedAt) { this.updatedAt = updatedAt; return this; } @@ -240,11 +239,11 @@ public CommentResponse updatedAt(@javax.annotation.Nonnull OffsetDateTime update * @return updatedAt */ @javax.annotation.Nonnull - public OffsetDateTime getUpdatedAt() { + public java.time.Instant getUpdatedAt() { return updatedAt; } - public void setUpdatedAt(@javax.annotation.Nonnull OffsetDateTime updatedAt) { + public void setUpdatedAt(@javax.annotation.Nonnull java.time.Instant updatedAt) { this.updatedAt = updatedAt; } diff --git a/src/main/java/ai/reveng/model/ExternalResponse.java b/src/main/java/ai/reveng/model/ExternalResponse.java index fe6f8f9..4edc45b 100644 --- a/src/main/java/ai/reveng/model/ExternalResponse.java +++ b/src/main/java/ai/reveng/model/ExternalResponse.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -67,7 +66,7 @@ public class ExternalResponse { public static final String SERIALIZED_NAME_LAST_UPDATED = "last_updated"; @SerializedName(SERIALIZED_NAME_LAST_UPDATED) @javax.annotation.Nonnull - private OffsetDateTime lastUpdated; + private java.time.Instant lastUpdated; public ExternalResponse() { } @@ -118,7 +117,7 @@ public void setData(@javax.annotation.Nonnull Map data) { } - public ExternalResponse lastUpdated(@javax.annotation.Nonnull OffsetDateTime lastUpdated) { + public ExternalResponse lastUpdated(@javax.annotation.Nonnull java.time.Instant lastUpdated) { this.lastUpdated = lastUpdated; return this; } @@ -128,11 +127,11 @@ public ExternalResponse lastUpdated(@javax.annotation.Nonnull OffsetDateTime las * @return lastUpdated */ @javax.annotation.Nonnull - public OffsetDateTime getLastUpdated() { + public java.time.Instant getLastUpdated() { return lastUpdated; } - public void setLastUpdated(@javax.annotation.Nonnull OffsetDateTime lastUpdated) { + public void setLastUpdated(@javax.annotation.Nonnull java.time.Instant lastUpdated) { this.lastUpdated = lastUpdated; } diff --git a/src/main/java/ai/reveng/model/FunctionSearchResult.java b/src/main/java/ai/reveng/model/FunctionSearchResult.java index 2c0be52..ee5a7bc 100644 --- a/src/main/java/ai/reveng/model/FunctionSearchResult.java +++ b/src/main/java/ai/reveng/model/FunctionSearchResult.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import com.google.gson.Gson; @@ -70,7 +69,7 @@ public class FunctionSearchResult { public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) @javax.annotation.Nonnull - private OffsetDateTime createdAt; + private java.time.Instant createdAt; public static final String SERIALIZED_NAME_MODEL_ID = "model_id"; @SerializedName(SERIALIZED_NAME_MODEL_ID) @@ -147,7 +146,7 @@ public void setBinaryName(@javax.annotation.Nonnull String binaryName) { } - public FunctionSearchResult createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public FunctionSearchResult createdAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; return this; } @@ -157,11 +156,11 @@ public FunctionSearchResult createdAt(@javax.annotation.Nonnull OffsetDateTime c * @return createdAt */ @javax.annotation.Nonnull - public OffsetDateTime getCreatedAt() { + public java.time.Instant getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull java.time.Instant createdAt) { this.createdAt = createdAt; } diff --git a/src/main/java/ai/reveng/model/GetUserResponse.java b/src/main/java/ai/reveng/model/GetUserResponse.java index 284eb20..d3c61eb 100644 --- a/src/main/java/ai/reveng/model/GetUserResponse.java +++ b/src/main/java/ai/reveng/model/GetUserResponse.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import com.google.gson.Gson; @@ -80,7 +79,7 @@ public class GetUserResponse { public static final String SERIALIZED_NAME_CREATION = "creation"; @SerializedName(SERIALIZED_NAME_CREATION) @javax.annotation.Nonnull - private OffsetDateTime creation; + private java.time.Instant creation; public static final String SERIALIZED_NAME_TUTORIAL_SEEN = "tutorial_seen"; @SerializedName(SERIALIZED_NAME_TUTORIAL_SEEN) @@ -185,7 +184,7 @@ public void setEmail(@javax.annotation.Nonnull String email) { } - public GetUserResponse creation(@javax.annotation.Nonnull OffsetDateTime creation) { + public GetUserResponse creation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; return this; } @@ -195,11 +194,11 @@ public GetUserResponse creation(@javax.annotation.Nonnull OffsetDateTime creatio * @return creation */ @javax.annotation.Nonnull - public OffsetDateTime getCreation() { + public java.time.Instant getCreation() { return creation; } - public void setCreation(@javax.annotation.Nonnull OffsetDateTime creation) { + public void setCreation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; } diff --git a/src/main/java/ai/reveng/model/MatchedFunctionSuggestion.java b/src/main/java/ai/reveng/model/MatchedFunctionSuggestion.java index 800c273..baaa22e 100644 --- a/src/main/java/ai/reveng/model/MatchedFunctionSuggestion.java +++ b/src/main/java/ai/reveng/model/MatchedFunctionSuggestion.java @@ -21,6 +21,7 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.Arrays; +import org.openapitools.jackson.nullable.JsonNullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -63,9 +64,14 @@ public class MatchedFunctionSuggestion { public static final String SERIALIZED_NAME_SUGGESTED_NAME = "suggested_name"; @SerializedName(SERIALIZED_NAME_SUGGESTED_NAME) - @javax.annotation.Nonnull + @javax.annotation.Nullable private String suggestedName; + public static final String SERIALIZED_NAME_SUGGESTED_DEMANGLED_NAME = "suggested_demangled_name"; + @SerializedName(SERIALIZED_NAME_SUGGESTED_DEMANGLED_NAME) + @javax.annotation.Nonnull + private String suggestedDemangledName; + public MatchedFunctionSuggestion() { } @@ -107,25 +113,44 @@ public void setFunctionVaddr(@javax.annotation.Nonnull Integer functionVaddr) { } - public MatchedFunctionSuggestion suggestedName(@javax.annotation.Nonnull String suggestedName) { + public MatchedFunctionSuggestion suggestedName(@javax.annotation.Nullable String suggestedName) { this.suggestedName = suggestedName; return this; } /** - * Name of the function group that contains the matched functions + * Get suggestedName * @return suggestedName */ - @javax.annotation.Nonnull + @javax.annotation.Nullable public String getSuggestedName() { return suggestedName; } - public void setSuggestedName(@javax.annotation.Nonnull String suggestedName) { + public void setSuggestedName(@javax.annotation.Nullable String suggestedName) { this.suggestedName = suggestedName; } + public MatchedFunctionSuggestion suggestedDemangledName(@javax.annotation.Nonnull String suggestedDemangledName) { + this.suggestedDemangledName = suggestedDemangledName; + return this; + } + + /** + * De-mangled name of the function group that contains the matched functions + * @return suggestedDemangledName + */ + @javax.annotation.Nonnull + public String getSuggestedDemangledName() { + return suggestedDemangledName; + } + + public void setSuggestedDemangledName(@javax.annotation.Nonnull String suggestedDemangledName) { + this.suggestedDemangledName = suggestedDemangledName; + } + + @Override public boolean equals(Object o) { @@ -138,12 +163,24 @@ public boolean equals(Object o) { MatchedFunctionSuggestion matchedFunctionSuggestion = (MatchedFunctionSuggestion) o; return Objects.equals(this.functionId, matchedFunctionSuggestion.functionId) && Objects.equals(this.functionVaddr, matchedFunctionSuggestion.functionVaddr) && - Objects.equals(this.suggestedName, matchedFunctionSuggestion.suggestedName); + Objects.equals(this.suggestedName, matchedFunctionSuggestion.suggestedName) && + Objects.equals(this.suggestedDemangledName, matchedFunctionSuggestion.suggestedDemangledName); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); } @Override public int hashCode() { - return Objects.hash(functionId, functionVaddr, suggestedName); + return Objects.hash(functionId, functionVaddr, suggestedName, suggestedDemangledName); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; } @Override @@ -153,6 +190,7 @@ public String toString() { sb.append(" functionId: ").append(toIndentedString(functionId)).append("\n"); sb.append(" functionVaddr: ").append(toIndentedString(functionVaddr)).append("\n"); sb.append(" suggestedName: ").append(toIndentedString(suggestedName)).append("\n"); + sb.append(" suggestedDemangledName: ").append(toIndentedString(suggestedDemangledName)).append("\n"); sb.append("}"); return sb.toString(); } @@ -174,10 +212,10 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("function_id", "function_vaddr", "suggested_name")); + openapiFields = new HashSet(Arrays.asList("function_id", "function_vaddr", "suggested_name", "suggested_demangled_name")); // a set of required properties/fields (JSON key names) - openapiRequiredFields = new HashSet(Arrays.asList("function_id", "function_vaddr", "suggested_name")); + openapiRequiredFields = new HashSet(Arrays.asList("function_id", "function_vaddr", "suggested_demangled_name")); } /** @@ -208,9 +246,12 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("suggested_name").isJsonPrimitive()) { + if ((jsonObj.get("suggested_name") != null && !jsonObj.get("suggested_name").isJsonNull()) && !jsonObj.get("suggested_name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `suggested_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("suggested_name").toString())); } + if (!jsonObj.get("suggested_demangled_name").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `suggested_demangled_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("suggested_demangled_name").toString())); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { diff --git a/src/main/java/ai/reveng/model/UserActivityResponse.java b/src/main/java/ai/reveng/model/UserActivityResponse.java index 17614e0..4b3687f 100644 --- a/src/main/java/ai/reveng/model/UserActivityResponse.java +++ b/src/main/java/ai/reveng/model/UserActivityResponse.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import com.google.gson.Gson; @@ -65,7 +64,7 @@ public class UserActivityResponse { public static final String SERIALIZED_NAME_CREATION = "creation"; @SerializedName(SERIALIZED_NAME_CREATION) @javax.annotation.Nonnull - private OffsetDateTime creation; + private java.time.Instant creation; public static final String SERIALIZED_NAME_MESSAGE = "message"; @SerializedName(SERIALIZED_NAME_MESSAGE) @@ -123,7 +122,7 @@ public void setActivityScope(@javax.annotation.Nonnull String activityScope) { } - public UserActivityResponse creation(@javax.annotation.Nonnull OffsetDateTime creation) { + public UserActivityResponse creation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; return this; } @@ -133,11 +132,11 @@ public UserActivityResponse creation(@javax.annotation.Nonnull OffsetDateTime cr * @return creation */ @javax.annotation.Nonnull - public OffsetDateTime getCreation() { + public java.time.Instant getCreation() { return creation; } - public void setCreation(@javax.annotation.Nonnull OffsetDateTime creation) { + public void setCreation(@javax.annotation.Nonnull java.time.Instant creation) { this.creation = creation; } diff --git a/src/test/java/ai/reveng/model/AnalysisRecordTest.java b/src/test/java/ai/reveng/model/AnalysisRecordTest.java index 744afeb..1fd4816 100644 --- a/src/test/java/ai/reveng/model/AnalysisRecordTest.java +++ b/src/test/java/ai/reveng/model/AnalysisRecordTest.java @@ -19,7 +19,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.openapitools.jackson.nullable.JsonNullable; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/ai/reveng/model/BasicTest.java b/src/test/java/ai/reveng/model/BasicTest.java index b29815f..0e3aafb 100644 --- a/src/test/java/ai/reveng/model/BasicTest.java +++ b/src/test/java/ai/reveng/model/BasicTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ai/reveng/model/BinaryAdditionalResponseTest.java b/src/test/java/ai/reveng/model/BinaryAdditionalResponseTest.java index bb20357..d9beb50 100644 --- a/src/test/java/ai/reveng/model/BinaryAdditionalResponseTest.java +++ b/src/test/java/ai/reveng/model/BinaryAdditionalResponseTest.java @@ -19,7 +19,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.openapitools.jackson.nullable.JsonNullable; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/ai/reveng/model/BinaryDetailsResponseTest.java b/src/test/java/ai/reveng/model/BinaryDetailsResponseTest.java index ebc843b..c84879e 100644 --- a/src/test/java/ai/reveng/model/BinaryDetailsResponseTest.java +++ b/src/test/java/ai/reveng/model/BinaryDetailsResponseTest.java @@ -19,7 +19,6 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.math.BigDecimal; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ai/reveng/model/BinaryExternalsResponseTest.java b/src/test/java/ai/reveng/model/BinaryExternalsResponseTest.java index 4357bb6..ea0ff35 100644 --- a/src/test/java/ai/reveng/model/BinaryExternalsResponseTest.java +++ b/src/test/java/ai/reveng/model/BinaryExternalsResponseTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/ai/reveng/model/BinarySearchResultTest.java b/src/test/java/ai/reveng/model/BinarySearchResultTest.java index 1c127a1..d633628 100644 --- a/src/test/java/ai/reveng/model/BinarySearchResultTest.java +++ b/src/test/java/ai/reveng/model/BinarySearchResultTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/ai/reveng/model/CollectionBinaryResponseTest.java b/src/test/java/ai/reveng/model/CollectionBinaryResponseTest.java index e97653c..4bee9ff 100644 --- a/src/test/java/ai/reveng/model/CollectionBinaryResponseTest.java +++ b/src/test/java/ai/reveng/model/CollectionBinaryResponseTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ai/reveng/model/CollectionListItemTest.java b/src/test/java/ai/reveng/model/CollectionListItemTest.java index cb33a68..fc6a6d1 100644 --- a/src/test/java/ai/reveng/model/CollectionListItemTest.java +++ b/src/test/java/ai/reveng/model/CollectionListItemTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/ai/reveng/model/CollectionResponseBinariesInnerTest.java b/src/test/java/ai/reveng/model/CollectionResponseBinariesInnerTest.java index f280a18..ade8020 100644 --- a/src/test/java/ai/reveng/model/CollectionResponseBinariesInnerTest.java +++ b/src/test/java/ai/reveng/model/CollectionResponseBinariesInnerTest.java @@ -19,7 +19,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ai/reveng/model/CollectionResponseTest.java b/src/test/java/ai/reveng/model/CollectionResponseTest.java index 2ad5c1a..9e42340 100644 --- a/src/test/java/ai/reveng/model/CollectionResponseTest.java +++ b/src/test/java/ai/reveng/model/CollectionResponseTest.java @@ -20,7 +20,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/ai/reveng/model/CollectionSearchResultTest.java b/src/test/java/ai/reveng/model/CollectionSearchResultTest.java index 862b2b2..6e33480 100644 --- a/src/test/java/ai/reveng/model/CollectionSearchResultTest.java +++ b/src/test/java/ai/reveng/model/CollectionSearchResultTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/ai/reveng/model/CommentResponseTest.java b/src/test/java/ai/reveng/model/CommentResponseTest.java index 825a91f..59be1db 100644 --- a/src/test/java/ai/reveng/model/CommentResponseTest.java +++ b/src/test/java/ai/reveng/model/CommentResponseTest.java @@ -19,7 +19,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.openapitools.jackson.nullable.JsonNullable; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/ai/reveng/model/ExternalResponseTest.java b/src/test/java/ai/reveng/model/ExternalResponseTest.java index ebbd567..2062eea 100644 --- a/src/test/java/ai/reveng/model/ExternalResponseTest.java +++ b/src/test/java/ai/reveng/model/ExternalResponseTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/ai/reveng/model/FunctionSearchResultTest.java b/src/test/java/ai/reveng/model/FunctionSearchResultTest.java index 8d34c11..3dec819 100644 --- a/src/test/java/ai/reveng/model/FunctionSearchResultTest.java +++ b/src/test/java/ai/reveng/model/FunctionSearchResultTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ai/reveng/model/GetUserResponseTest.java b/src/test/java/ai/reveng/model/GetUserResponseTest.java index c736ae6..fdfebb5 100644 --- a/src/test/java/ai/reveng/model/GetUserResponseTest.java +++ b/src/test/java/ai/reveng/model/GetUserResponseTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/ai/reveng/model/MatchedFunctionSuggestionTest.java b/src/test/java/ai/reveng/model/MatchedFunctionSuggestionTest.java index b7266b6..77c373a 100644 --- a/src/test/java/ai/reveng/model/MatchedFunctionSuggestionTest.java +++ b/src/test/java/ai/reveng/model/MatchedFunctionSuggestionTest.java @@ -19,6 +19,7 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.util.Arrays; +import org.openapitools.jackson.nullable.JsonNullable; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -60,4 +61,12 @@ public void suggestedNameTest() { // TODO: test suggestedName } + /** + * Test the property 'suggestedDemangledName' + */ + @Test + public void suggestedDemangledNameTest() { + // TODO: test suggestedDemangledName + } + } diff --git a/src/test/java/ai/reveng/model/UserActivityResponseTest.java b/src/test/java/ai/reveng/model/UserActivityResponseTest.java index 3051182..500272b 100644 --- a/src/test/java/ai/reveng/model/UserActivityResponseTest.java +++ b/src/test/java/ai/reveng/model/UserActivityResponseTest.java @@ -18,7 +18,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import java.time.OffsetDateTime; import java.util.Arrays; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;