From 8ad748610642b03285cf1900c14aa09c99515795 Mon Sep 17 00:00:00 2001 From: Annastacia McCarty <39739917+amvertex@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:55:17 -0500 Subject: [PATCH] Update to latest vertex-api - support end items (#39) --- README.md | 8 ++-- api/openapi.yaml | 23 +++++++++-- build.gradle | 2 +- src/main/java/com/vertexvis/ApiClient.java | 2 +- ...ceneItemOverrideRequestDataAttributes.java | 41 ++++++++++++++++--- .../CreateSceneItemRequestDataAttributes.java | 31 +++++++++++++- .../model/SceneItemDataAttributes.java | 31 +++++++++++++- .../SceneItemOverrideDataAttributes.java | 41 ++++++++++++++++--- ...ceneItemOverrideRequestDataAttributes.java | 41 ++++++++++++++++--- .../UpdateSceneItemRequestDataAttributes.java | 33 ++++++++++++++- 10 files changed, 222 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 9548f9e..f57a45f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The client can be used with Java 1.8+ and pulled into Maven or Gradle projects. com.vertexvis api-client-java - 0.6.5 + 0.6.6 compile ``` @@ -25,13 +25,13 @@ The client can be used with Java 1.8+ and pulled into Maven or Gradle projects. ### Gradle ```groovy -compile "com.vertexvis:api-client-java:0.6.5" +compile "com.vertexvis:api-client-java:0.6.6" ``` ### Sbt ```sbt -libraryDependencies += "com.vertexvis" % "api-client-java" % "0.6.5" +libraryDependencies += "com.vertexvis" % "api-client-java" % "0.6.6" ``` ### Others @@ -44,7 +44,7 @@ mvn clean package Then manually install the following JARs. -- `target/api-client-java-0.6.5.jar` +- `target/api-client-java-0.6.6.jar` - `target/lib/*.jar` ## Usage diff --git a/api/openapi.yaml b/api/openapi.yaml index 1bbfd98..e55d26e 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -9667,10 +9667,14 @@ components: material: $ref: '#/components/schemas/ColorMaterialNullable' selected: - $ref: '#/components/schemas/ColorMaterialNullable' + nullable: true + type: boolean phantom: nullable: true type: boolean + endItem: + nullable: true + type: boolean type: object UpdateSceneItemOverrideRequest_data: properties: @@ -9703,10 +9707,13 @@ components: material: $ref: '#/components/schemas/ColorMaterial' selected: - $ref: '#/components/schemas/ColorMaterial' + type: boolean phantom: description: Phantom state of the item. type: boolean + endItem: + description: Whether this item is an end item. + type: boolean type: object CreateSceneItemOverrideRequest_data_relationships: properties: @@ -9766,6 +9773,9 @@ components: phantom: description: Phantom state of the item. type: boolean + endItem: + description: Whether this item is an end item. + type: boolean type: object UpdateSceneItemRequest_data_relationships: properties: @@ -10333,6 +10343,8 @@ components: example: 2020-01-01T12:00:00Z format: date-time type: string + endItem: + type: boolean materialOverride: $ref: '#/components/schemas/ColorMaterial' metadata: @@ -10497,9 +10509,11 @@ components: material: $ref: '#/components/schemas/ColorMaterial' selected: - $ref: '#/components/schemas/ColorMaterial' + type: boolean phantom: type: boolean + endItem: + type: boolean required: - created type: object @@ -10573,6 +10587,9 @@ components: phantom: description: Phantom state of the item. type: boolean + endItem: + description: Whether this item is an end item. + type: boolean metadata: additionalProperties: anyOf: diff --git a/build.gradle b/build.gradle index 034bf17..e9e68c9 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.vertexvis' -version = '0.6.5' +version = '0.6.6' repositories { mavenCentral() diff --git a/src/main/java/com/vertexvis/ApiClient.java b/src/main/java/com/vertexvis/ApiClient.java index b95d177..42a0e96 100644 --- a/src/main/java/com/vertexvis/ApiClient.java +++ b/src/main/java/com/vertexvis/ApiClient.java @@ -207,7 +207,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("vertex-api-client-java/0.6.5"); + setUserAgent("vertex-api-client-java/0.6.6"); authentications = new HashMap(); } diff --git a/src/main/java/com/vertexvis/model/CreateSceneItemOverrideRequestDataAttributes.java b/src/main/java/com/vertexvis/model/CreateSceneItemOverrideRequestDataAttributes.java index 39b74da..6e37300 100644 --- a/src/main/java/com/vertexvis/model/CreateSceneItemOverrideRequestDataAttributes.java +++ b/src/main/java/com/vertexvis/model/CreateSceneItemOverrideRequestDataAttributes.java @@ -45,12 +45,16 @@ public class CreateSceneItemOverrideRequestDataAttributes { public static final String SERIALIZED_NAME_SELECTED = "selected"; @SerializedName(SERIALIZED_NAME_SELECTED) - private ColorMaterial selected; + private Boolean selected; public static final String SERIALIZED_NAME_PHANTOM = "phantom"; @SerializedName(SERIALIZED_NAME_PHANTOM) private Boolean phantom; + public static final String SERIALIZED_NAME_END_ITEM = "endItem"; + @SerializedName(SERIALIZED_NAME_END_ITEM) + private Boolean endItem; + public CreateSceneItemOverrideRequestDataAttributes() { } @@ -123,7 +127,7 @@ public void setMaterial(ColorMaterial material) { } - public CreateSceneItemOverrideRequestDataAttributes selected(ColorMaterial selected) { + public CreateSceneItemOverrideRequestDataAttributes selected(Boolean selected) { this.selected = selected; return this; @@ -136,12 +140,12 @@ public CreateSceneItemOverrideRequestDataAttributes selected(ColorMaterial selec @javax.annotation.Nullable @ApiModelProperty(value = "") - public ColorMaterial getSelected() { + public Boolean getSelected() { return selected; } - public void setSelected(ColorMaterial selected) { + public void setSelected(Boolean selected) { this.selected = selected; } @@ -169,6 +173,29 @@ public void setPhantom(Boolean phantom) { } + public CreateSceneItemOverrideRequestDataAttributes endItem(Boolean endItem) { + + this.endItem = endItem; + return this; + } + + /** + * Whether this item is an end item. + * @return endItem + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Whether this item is an end item.") + + public Boolean getEndItem() { + return endItem; + } + + + public void setEndItem(Boolean endItem) { + this.endItem = endItem; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -182,12 +209,13 @@ public boolean equals(Object o) { Objects.equals(this.transform, createSceneItemOverrideRequestDataAttributes.transform) && Objects.equals(this.material, createSceneItemOverrideRequestDataAttributes.material) && Objects.equals(this.selected, createSceneItemOverrideRequestDataAttributes.selected) && - Objects.equals(this.phantom, createSceneItemOverrideRequestDataAttributes.phantom); + Objects.equals(this.phantom, createSceneItemOverrideRequestDataAttributes.phantom) && + Objects.equals(this.endItem, createSceneItemOverrideRequestDataAttributes.endItem); } @Override public int hashCode() { - return Objects.hash(visible, transform, material, selected, phantom); + return Objects.hash(visible, transform, material, selected, phantom, endItem); } @Override @@ -199,6 +227,7 @@ public String toString() { sb.append(" material: ").append(toIndentedString(material)).append("\n"); sb.append(" selected: ").append(toIndentedString(selected)).append("\n"); sb.append(" phantom: ").append(toIndentedString(phantom)).append("\n"); + sb.append(" endItem: ").append(toIndentedString(endItem)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/com/vertexvis/model/CreateSceneItemRequestDataAttributes.java b/src/main/java/com/vertexvis/model/CreateSceneItemRequestDataAttributes.java index e70cb9f..71514d0 100644 --- a/src/main/java/com/vertexvis/model/CreateSceneItemRequestDataAttributes.java +++ b/src/main/java/com/vertexvis/model/CreateSceneItemRequestDataAttributes.java @@ -76,6 +76,10 @@ public class CreateSceneItemRequestDataAttributes { @SerializedName(SERIALIZED_NAME_PHANTOM) private Boolean phantom; + public static final String SERIALIZED_NAME_END_ITEM = "endItem"; + @SerializedName(SERIALIZED_NAME_END_ITEM) + private Boolean endItem; + public static final String SERIALIZED_NAME_METADATA = "metadata"; @SerializedName(SERIALIZED_NAME_METADATA) private Map metadata = null; @@ -313,6 +317,29 @@ public void setPhantom(Boolean phantom) { } + public CreateSceneItemRequestDataAttributes endItem(Boolean endItem) { + + this.endItem = endItem; + return this; + } + + /** + * Whether this item is an end item. + * @return endItem + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Whether this item is an end item.") + + public Boolean getEndItem() { + return endItem; + } + + + public void setEndItem(Boolean endItem) { + this.endItem = endItem; + } + + public CreateSceneItemRequestDataAttributes metadata(Map metadata) { this.metadata = metadata; @@ -363,12 +390,13 @@ public boolean equals(Object o) { Objects.equals(this.transform, createSceneItemRequestDataAttributes.transform) && Objects.equals(this.visible, createSceneItemRequestDataAttributes.visible) && Objects.equals(this.phantom, createSceneItemRequestDataAttributes.phantom) && + Objects.equals(this.endItem, createSceneItemRequestDataAttributes.endItem) && Objects.equals(this.metadata, createSceneItemRequestDataAttributes.metadata); } @Override public int hashCode() { - return Objects.hash(materialOverride, name, ordinal, parent, partInstanceSuppliedIdsAsSuppliedIds, source, suppliedId, transform, visible, phantom, metadata); + return Objects.hash(materialOverride, name, ordinal, parent, partInstanceSuppliedIdsAsSuppliedIds, source, suppliedId, transform, visible, phantom, endItem, metadata); } @Override @@ -385,6 +413,7 @@ public String toString() { sb.append(" transform: ").append(toIndentedString(transform)).append("\n"); sb.append(" visible: ").append(toIndentedString(visible)).append("\n"); sb.append(" phantom: ").append(toIndentedString(phantom)).append("\n"); + sb.append(" endItem: ").append(toIndentedString(endItem)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/vertexvis/model/SceneItemDataAttributes.java b/src/main/java/com/vertexvis/model/SceneItemDataAttributes.java index e47715b..87e19b9 100644 --- a/src/main/java/com/vertexvis/model/SceneItemDataAttributes.java +++ b/src/main/java/com/vertexvis/model/SceneItemDataAttributes.java @@ -45,6 +45,10 @@ public class SceneItemDataAttributes { @SerializedName(SERIALIZED_NAME_CREATED) private OffsetDateTime created; + public static final String SERIALIZED_NAME_END_ITEM = "endItem"; + @SerializedName(SERIALIZED_NAME_END_ITEM) + private Boolean endItem; + public static final String SERIALIZED_NAME_MATERIAL_OVERRIDE = "materialOverride"; @SerializedName(SERIALIZED_NAME_MATERIAL_OVERRIDE) private ColorMaterial materialOverride; @@ -126,6 +130,29 @@ public void setCreated(OffsetDateTime created) { } + public SceneItemDataAttributes endItem(Boolean endItem) { + + this.endItem = endItem; + return this; + } + + /** + * Get endItem + * @return endItem + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public Boolean getEndItem() { + return endItem; + } + + + public void setEndItem(Boolean endItem) { + this.endItem = endItem; + } + + public SceneItemDataAttributes materialOverride(ColorMaterial materialOverride) { this.materialOverride = materialOverride; @@ -329,6 +356,7 @@ public boolean equals(Object o) { SceneItemDataAttributes sceneItemDataAttributes = (SceneItemDataAttributes) o; return Objects.equals(this.boundingBox, sceneItemDataAttributes.boundingBox) && Objects.equals(this.created, sceneItemDataAttributes.created) && + Objects.equals(this.endItem, sceneItemDataAttributes.endItem) && Objects.equals(this.materialOverride, sceneItemDataAttributes.materialOverride) && Objects.equals(this.metadata, sceneItemDataAttributes.metadata) && Objects.equals(this.name, sceneItemDataAttributes.name) && @@ -341,7 +369,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(boundingBox, created, materialOverride, metadata, name, phantom, suppliedId, transform, visible, worldTransform); + return Objects.hash(boundingBox, created, endItem, materialOverride, metadata, name, phantom, suppliedId, transform, visible, worldTransform); } @Override @@ -350,6 +378,7 @@ public String toString() { sb.append("class SceneItemDataAttributes {\n"); sb.append(" boundingBox: ").append(toIndentedString(boundingBox)).append("\n"); sb.append(" created: ").append(toIndentedString(created)).append("\n"); + sb.append(" endItem: ").append(toIndentedString(endItem)).append("\n"); sb.append(" materialOverride: ").append(toIndentedString(materialOverride)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); diff --git a/src/main/java/com/vertexvis/model/SceneItemOverrideDataAttributes.java b/src/main/java/com/vertexvis/model/SceneItemOverrideDataAttributes.java index c3f367f..7c7086b 100644 --- a/src/main/java/com/vertexvis/model/SceneItemOverrideDataAttributes.java +++ b/src/main/java/com/vertexvis/model/SceneItemOverrideDataAttributes.java @@ -50,12 +50,16 @@ public class SceneItemOverrideDataAttributes { public static final String SERIALIZED_NAME_SELECTED = "selected"; @SerializedName(SERIALIZED_NAME_SELECTED) - private ColorMaterial selected; + private Boolean selected; public static final String SERIALIZED_NAME_PHANTOM = "phantom"; @SerializedName(SERIALIZED_NAME_PHANTOM) private Boolean phantom; + public static final String SERIALIZED_NAME_END_ITEM = "endItem"; + @SerializedName(SERIALIZED_NAME_END_ITEM) + private Boolean endItem; + public SceneItemOverrideDataAttributes() { } @@ -151,7 +155,7 @@ public void setMaterial(ColorMaterial material) { } - public SceneItemOverrideDataAttributes selected(ColorMaterial selected) { + public SceneItemOverrideDataAttributes selected(Boolean selected) { this.selected = selected; return this; @@ -164,12 +168,12 @@ public SceneItemOverrideDataAttributes selected(ColorMaterial selected) { @javax.annotation.Nullable @ApiModelProperty(value = "") - public ColorMaterial getSelected() { + public Boolean getSelected() { return selected; } - public void setSelected(ColorMaterial selected) { + public void setSelected(Boolean selected) { this.selected = selected; } @@ -197,6 +201,29 @@ public void setPhantom(Boolean phantom) { } + public SceneItemOverrideDataAttributes endItem(Boolean endItem) { + + this.endItem = endItem; + return this; + } + + /** + * Get endItem + * @return endItem + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public Boolean getEndItem() { + return endItem; + } + + + public void setEndItem(Boolean endItem) { + this.endItem = endItem; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -211,12 +238,13 @@ public boolean equals(Object o) { Objects.equals(this.transform, sceneItemOverrideDataAttributes.transform) && Objects.equals(this.material, sceneItemOverrideDataAttributes.material) && Objects.equals(this.selected, sceneItemOverrideDataAttributes.selected) && - Objects.equals(this.phantom, sceneItemOverrideDataAttributes.phantom); + Objects.equals(this.phantom, sceneItemOverrideDataAttributes.phantom) && + Objects.equals(this.endItem, sceneItemOverrideDataAttributes.endItem); } @Override public int hashCode() { - return Objects.hash(created, visible, transform, material, selected, phantom); + return Objects.hash(created, visible, transform, material, selected, phantom, endItem); } @Override @@ -229,6 +257,7 @@ public String toString() { sb.append(" material: ").append(toIndentedString(material)).append("\n"); sb.append(" selected: ").append(toIndentedString(selected)).append("\n"); sb.append(" phantom: ").append(toIndentedString(phantom)).append("\n"); + sb.append(" endItem: ").append(toIndentedString(endItem)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/com/vertexvis/model/UpdateSceneItemOverrideRequestDataAttributes.java b/src/main/java/com/vertexvis/model/UpdateSceneItemOverrideRequestDataAttributes.java index b7fee43..3acc5f7 100644 --- a/src/main/java/com/vertexvis/model/UpdateSceneItemOverrideRequestDataAttributes.java +++ b/src/main/java/com/vertexvis/model/UpdateSceneItemOverrideRequestDataAttributes.java @@ -46,12 +46,16 @@ public class UpdateSceneItemOverrideRequestDataAttributes { public static final String SERIALIZED_NAME_SELECTED = "selected"; @SerializedName(SERIALIZED_NAME_SELECTED) - private ColorMaterialNullable selected; + private Boolean selected; public static final String SERIALIZED_NAME_PHANTOM = "phantom"; @SerializedName(SERIALIZED_NAME_PHANTOM) private Boolean phantom; + public static final String SERIALIZED_NAME_END_ITEM = "endItem"; + @SerializedName(SERIALIZED_NAME_END_ITEM) + private Boolean endItem; + public UpdateSceneItemOverrideRequestDataAttributes() { } @@ -124,7 +128,7 @@ public void setMaterial(ColorMaterialNullable material) { } - public UpdateSceneItemOverrideRequestDataAttributes selected(ColorMaterialNullable selected) { + public UpdateSceneItemOverrideRequestDataAttributes selected(Boolean selected) { this.selected = selected; return this; @@ -137,12 +141,12 @@ public UpdateSceneItemOverrideRequestDataAttributes selected(ColorMaterialNullab @javax.annotation.Nullable @ApiModelProperty(value = "") - public ColorMaterialNullable getSelected() { + public Boolean getSelected() { return selected; } - public void setSelected(ColorMaterialNullable selected) { + public void setSelected(Boolean selected) { this.selected = selected; } @@ -170,6 +174,29 @@ public void setPhantom(Boolean phantom) { } + public UpdateSceneItemOverrideRequestDataAttributes endItem(Boolean endItem) { + + this.endItem = endItem; + return this; + } + + /** + * Get endItem + * @return endItem + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public Boolean getEndItem() { + return endItem; + } + + + public void setEndItem(Boolean endItem) { + this.endItem = endItem; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -183,7 +210,8 @@ public boolean equals(Object o) { Objects.equals(this.transform, updateSceneItemOverrideRequestDataAttributes.transform) && Objects.equals(this.material, updateSceneItemOverrideRequestDataAttributes.material) && Objects.equals(this.selected, updateSceneItemOverrideRequestDataAttributes.selected) && - Objects.equals(this.phantom, updateSceneItemOverrideRequestDataAttributes.phantom); + Objects.equals(this.phantom, updateSceneItemOverrideRequestDataAttributes.phantom) && + Objects.equals(this.endItem, updateSceneItemOverrideRequestDataAttributes.endItem); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -192,7 +220,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(visible, transform, material, selected, phantom); + return Objects.hash(visible, transform, material, selected, phantom, endItem); } private static int hashCodeNullable(JsonNullable a) { @@ -211,6 +239,7 @@ public String toString() { sb.append(" material: ").append(toIndentedString(material)).append("\n"); sb.append(" selected: ").append(toIndentedString(selected)).append("\n"); sb.append(" phantom: ").append(toIndentedString(phantom)).append("\n"); + sb.append(" endItem: ").append(toIndentedString(endItem)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/com/vertexvis/model/UpdateSceneItemRequestDataAttributes.java b/src/main/java/com/vertexvis/model/UpdateSceneItemRequestDataAttributes.java index 8a035bb..31fa793 100644 --- a/src/main/java/com/vertexvis/model/UpdateSceneItemRequestDataAttributes.java +++ b/src/main/java/com/vertexvis/model/UpdateSceneItemRequestDataAttributes.java @@ -63,6 +63,10 @@ public class UpdateSceneItemRequestDataAttributes { @SerializedName(SERIALIZED_NAME_PHANTOM) private Boolean phantom; + public static final String SERIALIZED_NAME_END_ITEM = "endItem"; + @SerializedName(SERIALIZED_NAME_END_ITEM) + private Boolean endItem; + public UpdateSceneItemRequestDataAttributes() { } @@ -235,6 +239,29 @@ public void setPhantom(Boolean phantom) { } + public UpdateSceneItemRequestDataAttributes endItem(Boolean endItem) { + + this.endItem = endItem; + return this; + } + + /** + * Whether this item is an end item. + * @return endItem + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Whether this item is an end item.") + + public Boolean getEndItem() { + return endItem; + } + + + public void setEndItem(Boolean endItem) { + this.endItem = endItem; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -250,12 +277,13 @@ public boolean equals(Object o) { Objects.equals(this.name, updateSceneItemRequestDataAttributes.name) && Objects.equals(this.suppliedId, updateSceneItemRequestDataAttributes.suppliedId) && Objects.equals(this.metadata, updateSceneItemRequestDataAttributes.metadata) && - Objects.equals(this.phantom, updateSceneItemRequestDataAttributes.phantom); + Objects.equals(this.phantom, updateSceneItemRequestDataAttributes.phantom) && + Objects.equals(this.endItem, updateSceneItemRequestDataAttributes.endItem); } @Override public int hashCode() { - return Objects.hash(visible, materialOverride, transform, name, suppliedId, metadata, phantom); + return Objects.hash(visible, materialOverride, transform, name, suppliedId, metadata, phantom, endItem); } @Override @@ -269,6 +297,7 @@ public String toString() { sb.append(" suppliedId: ").append(toIndentedString(suppliedId)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); sb.append(" phantom: ").append(toIndentedString(phantom)).append("\n"); + sb.append(" endItem: ").append(toIndentedString(endItem)).append("\n"); sb.append("}"); return sb.toString(); }