diff --git a/.codegen/_openapi_sha b/.codegen/_openapi_sha index aa1180c39..3182720e8 100644 --- a/.codegen/_openapi_sha +++ b/.codegen/_openapi_sha @@ -1 +1 @@ -b54bbd860200d735fa2c306ec1559090625370e6 \ No newline at end of file +file:/home/hector.castejon/well-known-java/bazel-bin/openapi/all-internal.json \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index d3dfd069a..71a6f88b6 100755 --- a/.gitattributes +++ b/.gitattributes @@ -1673,6 +1673,7 @@ databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/ApproveTransitio databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/ApproveTransitionRequestResponse.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/CommentActivityAction.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/CommentObject.java linguist-generated=true +databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/ContinuousWindow.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/CreateComment.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/CreateCommentResponse.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/CreateExperiment.java linguist-generated=true @@ -1890,6 +1891,7 @@ databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SetLoggedModelTa databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SetModelTagRequest.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SetModelVersionTagRequest.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SetTag.java linguist-generated=true +databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SlidingWindow.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/Status.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TestRegistryWebhookRequest.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TestRegistryWebhookResponse.java linguist-generated=true @@ -1897,6 +1899,7 @@ databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TimeWindow.java databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TransitionModelVersionStageDatabricks.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TransitionRequest.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TransitionStageResponse.java linguist-generated=true +databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TumblingWindow.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/UpdateComment.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/UpdateCommentResponse.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/UpdateExperiment.java linguist-generated=true @@ -2734,6 +2737,7 @@ databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertCondition. databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertConditionOperand.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertConditionThreshold.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertEvaluationState.java linguist-generated=true +databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertLifecycleState.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertOperandColumn.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertOperandValue.java linguist-generated=true databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertOperator.java linguist-generated=true diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GrpcTranscodingQueryParamsSerializer.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GrpcTranscodingQueryParamsSerializer.java index 80ddc735c..fbb53c73f 100644 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GrpcTranscodingQueryParamsSerializer.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/GrpcTranscodingQueryParamsSerializer.java @@ -2,6 +2,7 @@ import com.databricks.sdk.support.QueryParam; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.protobuf.FieldMask; import java.lang.reflect.Field; import java.util.*; @@ -118,6 +119,8 @@ private static Map flattenObject(Object o, Boolean onlyAnnotated || Iterable.class.isAssignableFrom(type) || type.isEnum()) { result.put(name, value); + } else if (FieldMask.class.isAssignableFrom(type)) { + result.put(name, String.join(",", ((FieldMask) value).getPathsList())); } else { // recursively flatten the object Map flattened = flattenObject(value, false); diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurablePermission.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurablePermission.java index bca1f6476..1a614264f 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurablePermission.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurablePermission.java @@ -8,5 +8,6 @@ public enum AppManifestAppResourceUcSecurableSpecUcSecurablePermission { MANAGE, READ_VOLUME, + SELECT, WRITE_VOLUME, } diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurableType.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurableType.java index f6a970e70..45cccb2d5 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurableType.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/AppManifestAppResourceUcSecurableSpecUcSecurableType.java @@ -6,5 +6,6 @@ @Generated public enum AppManifestAppResourceUcSecurableSpecUcSecurableType { + TABLE, VOLUME, } diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/ConnectionType.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/ConnectionType.java index f852713c7..ffbf0fff6 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/ConnectionType.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/ConnectionType.java @@ -4,7 +4,7 @@ import com.databricks.sdk.support.Generated; -/** Next Id: 46 */ +/** Next Id: 47 */ @Generated public enum ConnectionType { BIGQUERY, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/SecurableKind.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/SecurableKind.java index c42d7e06e..d947e19aa 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/SecurableKind.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/catalog/SecurableKind.java @@ -4,7 +4,7 @@ import com.databricks.sdk.support.Generated; -/** Latest kind: CONNECTION_SALESFORCE_OAUTH_MTLS = 268; Next id:269 */ +/** Latest kind: CONNECTION_AWS_SECRETS_MANAGER = 270; Next id:271 */ @Generated public enum SecurableKind { TABLE_DB_STORAGE, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/EventType.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/EventType.java index c1a501e22..7f20b2be8 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/EventType.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/EventType.java @@ -14,6 +14,8 @@ public enum EventType { CLUSTER_MIGRATED, CREATING, DBFS_DOWN, + DECOMMISSION_ENDED, + DECOMMISSION_STARTED, DID_NOT_EXPAND_DISK, DRIVER_HEALTHY, DRIVER_NOT_RESPONDING, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/ContinuousWindow.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/ContinuousWindow.java new file mode 100755 index 000000000..52cea43c3 --- /dev/null +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/ContinuousWindow.java @@ -0,0 +1,59 @@ +// Code generated from OpenAPI specs by Databricks SDK Generator. DO NOT EDIT. + +package com.databricks.sdk.service.ml; + +import com.databricks.sdk.support.Generated; +import com.databricks.sdk.support.ToStringer; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Objects; + +@Generated +public class ContinuousWindow { + /** The offset of the continuous window (must be non-positive). */ + @JsonProperty("offset") + private String offset; + + /** The duration of the continuous window (must be positive). */ + @JsonProperty("window_duration") + private String windowDuration; + + public ContinuousWindow setOffset(String offset) { + this.offset = offset; + return this; + } + + public String getOffset() { + return offset; + } + + public ContinuousWindow setWindowDuration(String windowDuration) { + this.windowDuration = windowDuration; + return this; + } + + public String getWindowDuration() { + return windowDuration; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ContinuousWindow that = (ContinuousWindow) o; + return Objects.equals(offset, that.offset) + && Objects.equals(windowDuration, that.windowDuration); + } + + @Override + public int hashCode() { + return Objects.hash(offset, windowDuration); + } + + @Override + public String toString() { + return new ToStringer(ContinuousWindow.class) + .add("offset", offset) + .add("windowDuration", windowDuration) + .toString(); + } +} diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SlidingWindow.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SlidingWindow.java new file mode 100755 index 000000000..af269bd82 --- /dev/null +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/SlidingWindow.java @@ -0,0 +1,62 @@ +// Code generated from OpenAPI specs by Databricks SDK Generator. DO NOT EDIT. + +package com.databricks.sdk.service.ml; + +import com.databricks.sdk.support.Generated; +import com.databricks.sdk.support.ToStringer; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Objects; + +@Generated +public class SlidingWindow { + /** + * The slide duration (interval by which windows advance, must be positive and less than + * duration). + */ + @JsonProperty("slide_duration") + private String slideDuration; + + /** The duration of the sliding window. */ + @JsonProperty("window_duration") + private String windowDuration; + + public SlidingWindow setSlideDuration(String slideDuration) { + this.slideDuration = slideDuration; + return this; + } + + public String getSlideDuration() { + return slideDuration; + } + + public SlidingWindow setWindowDuration(String windowDuration) { + this.windowDuration = windowDuration; + return this; + } + + public String getWindowDuration() { + return windowDuration; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + SlidingWindow that = (SlidingWindow) o; + return Objects.equals(slideDuration, that.slideDuration) + && Objects.equals(windowDuration, that.windowDuration); + } + + @Override + public int hashCode() { + return Objects.hash(slideDuration, windowDuration); + } + + @Override + public String toString() { + return new ToStringer(SlidingWindow.class) + .add("slideDuration", slideDuration) + .add("windowDuration", windowDuration) + .toString(); + } +} diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TimeWindow.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TimeWindow.java index 92b87ec1d..c270410fb 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TimeWindow.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TimeWindow.java @@ -9,30 +9,43 @@ @Generated public class TimeWindow { - /** The duration of the time window. */ - @JsonProperty("duration") - private String duration; + /** */ + @JsonProperty("continuous") + private ContinuousWindow continuous; - /** The offset of the time window. */ - @JsonProperty("offset") - private String offset; + /** */ + @JsonProperty("sliding") + private SlidingWindow sliding; - public TimeWindow setDuration(String duration) { - this.duration = duration; + /** */ + @JsonProperty("tumbling") + private TumblingWindow tumbling; + + public TimeWindow setContinuous(ContinuousWindow continuous) { + this.continuous = continuous; + return this; + } + + public ContinuousWindow getContinuous() { + return continuous; + } + + public TimeWindow setSliding(SlidingWindow sliding) { + this.sliding = sliding; return this; } - public String getDuration() { - return duration; + public SlidingWindow getSliding() { + return sliding; } - public TimeWindow setOffset(String offset) { - this.offset = offset; + public TimeWindow setTumbling(TumblingWindow tumbling) { + this.tumbling = tumbling; return this; } - public String getOffset() { - return offset; + public TumblingWindow getTumbling() { + return tumbling; } @Override @@ -40,19 +53,22 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; TimeWindow that = (TimeWindow) o; - return Objects.equals(duration, that.duration) && Objects.equals(offset, that.offset); + return Objects.equals(continuous, that.continuous) + && Objects.equals(sliding, that.sliding) + && Objects.equals(tumbling, that.tumbling); } @Override public int hashCode() { - return Objects.hash(duration, offset); + return Objects.hash(continuous, sliding, tumbling); } @Override public String toString() { return new ToStringer(TimeWindow.class) - .add("duration", duration) - .add("offset", offset) + .add("continuous", continuous) + .add("sliding", sliding) + .add("tumbling", tumbling) .toString(); } } diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TumblingWindow.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TumblingWindow.java new file mode 100755 index 000000000..a69d5ae25 --- /dev/null +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/ml/TumblingWindow.java @@ -0,0 +1,42 @@ +// Code generated from OpenAPI specs by Databricks SDK Generator. DO NOT EDIT. + +package com.databricks.sdk.service.ml; + +import com.databricks.sdk.support.Generated; +import com.databricks.sdk.support.ToStringer; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Objects; + +@Generated +public class TumblingWindow { + /** The duration of each tumbling window (non-overlapping, fixed-duration windows). */ + @JsonProperty("window_duration") + private String windowDuration; + + public TumblingWindow setWindowDuration(String windowDuration) { + this.windowDuration = windowDuration; + return this; + } + + public String getWindowDuration() { + return windowDuration; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + TumblingWindow that = (TumblingWindow) o; + return Objects.equals(windowDuration, that.windowDuration); + } + + @Override + public int hashCode() { + return Objects.hash(windowDuration); + } + + @Override + public String toString() { + return new ToStringer(TumblingWindow.class).add("windowDuration", windowDuration).toString(); + } +} diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertLifecycleState.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertLifecycleState.java new file mode 100755 index 000000000..f58da43b4 --- /dev/null +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertLifecycleState.java @@ -0,0 +1,11 @@ +// Code generated from OpenAPI specs by Databricks SDK Generator. DO NOT EDIT. + +package com.databricks.sdk.service.sql; + +import com.databricks.sdk.support.Generated; + +@Generated +public enum AlertLifecycleState { + ACTIVE, + TRASHED, +} diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertV2.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertV2.java index 38cf96892..68a322dc1 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertV2.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/AlertV2.java @@ -42,7 +42,7 @@ public class AlertV2 { /** Indicates whether the query is trashed. */ @JsonProperty("lifecycle_state") - private LifecycleState lifecycleState; + private AlertLifecycleState lifecycleState; /** The owner's username. This field is set to "Unavailable" if the user has been deleted. */ @JsonProperty("owner_user_name") @@ -153,12 +153,12 @@ public String getId() { return id; } - public AlertV2 setLifecycleState(LifecycleState lifecycleState) { + public AlertV2 setLifecycleState(AlertLifecycleState lifecycleState) { this.lifecycleState = lifecycleState; return this; } - public LifecycleState getLifecycleState() { + public AlertLifecycleState getLifecycleState() { return lifecycleState; } diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/QueryMetrics.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/QueryMetrics.java index af3a6275a..2030d9210 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/QueryMetrics.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/QueryMetrics.java @@ -60,7 +60,7 @@ public class QueryMetrics { @JsonProperty("provisioning_queue_start_timestamp") private Long provisioningQueueStartTimestamp; - /** Total number of bytes in all tables not read due to pruning */ + /** Total number of file bytes in all tables not read due to pruning */ @JsonProperty("pruned_bytes") private Long prunedBytes; @@ -80,6 +80,10 @@ public class QueryMetrics { @JsonProperty("read_cache_bytes") private Long readCacheBytes; + /** Total number of file bytes in all tables read */ + @JsonProperty("read_files_bytes") + private Long readFilesBytes; + /** Number of files read after pruning */ @JsonProperty("read_files_count") private Long readFilesCount; @@ -270,6 +274,15 @@ public Long getReadCacheBytes() { return readCacheBytes; } + public QueryMetrics setReadFilesBytes(Long readFilesBytes) { + this.readFilesBytes = readFilesBytes; + return this; + } + + public Long getReadFilesBytes() { + return readFilesBytes; + } + public QueryMetrics setReadFilesCount(Long readFilesCount) { this.readFilesCount = readFilesCount; return this; @@ -423,6 +436,7 @@ public boolean equals(Object o) { && Objects.equals(queryCompilationStartTimestamp, that.queryCompilationStartTimestamp) && Objects.equals(readBytes, that.readBytes) && Objects.equals(readCacheBytes, that.readCacheBytes) + && Objects.equals(readFilesBytes, that.readFilesBytes) && Objects.equals(readFilesCount, that.readFilesCount) && Objects.equals(readPartitionsCount, that.readPartitionsCount) && Objects.equals(readRemoteBytes, that.readRemoteBytes) @@ -456,6 +470,7 @@ public int hashCode() { queryCompilationStartTimestamp, readBytes, readCacheBytes, + readFilesBytes, readFilesCount, readPartitionsCount, readRemoteBytes, @@ -489,6 +504,7 @@ public String toString() { .add("queryCompilationStartTimestamp", queryCompilationStartTimestamp) .add("readBytes", readBytes) .add("readCacheBytes", readCacheBytes) + .add("readFilesBytes", readFilesBytes) .add("readFilesCount", readFilesCount) .add("readPartitionsCount", readPartitionsCount) .add("readRemoteBytes", readRemoteBytes) diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceAPI.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceAPI.java index 5de50575c..014e41767 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceAPI.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceAPI.java @@ -104,7 +104,7 @@ public ObjectInfo getStatus(GetStatusRequest request) { * directory. If `path` already exists and `overwrite` is set to `false`, this call returns an * error `RESOURCE_ALREADY_EXISTS`. To import a directory, you can use either the `DBC` format or * the `SOURCE` format with the `language` field unset. To import a single file as `SOURCE`, you - * must set the `language` field. + * must set the `language` field. Zip files within directories are not supported. */ public void importContent(Import request) { impl.importContent(request); diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceService.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceService.java index 75c4a0608..afdd3356e 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceService.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/workspace/WorkspaceService.java @@ -57,7 +57,7 @@ WorkspaceObjectPermissions getPermissions( * directory. If `path` already exists and `overwrite` is set to `false`, this call returns an * error `RESOURCE_ALREADY_EXISTS`. To import a directory, you can use either the `DBC` format or * the `SOURCE` format with the `language` field unset. To import a single file as `SOURCE`, you - * must set the `language` field. + * must set the `language` field. Zip files within directories are not supported. */ void importContent(Import importContent); diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java index 9da7d1adf..5132dcc6c 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/HttpPathTest.java @@ -15,6 +15,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.protobuf.FieldMask; import java.io.IOException; import java.net.URL; import java.util.*; @@ -173,7 +174,10 @@ static List testCases() throws JsonProcessingException, JsonMappingExc .setQueryParamString("query_string_val") .setQueryParamInt(999L) .setQueryParamBool(true) - .setFieldMask("field.mask.value")); + .setFieldMask( + FieldMask.newBuilder() + .addAllPaths(Arrays.asList("field.mask.value".split(", "))) + .build())); } catch (Exception e) { throw new RuntimeException(e); } @@ -353,7 +357,10 @@ static List testCases() throws JsonProcessingException, JsonMappingExc .setQueryParamString("query_string_val") .setQueryParamInt(999L) .setQueryParamBool(true) - .setFieldMask("field.mask.value")); + .setFieldMask( + FieldMask.newBuilder() + .addAllPaths(Arrays.asList("field.mask.value".split(", "))) + .build())); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/MarshallTest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/MarshallTest.java index c35078873..8c803ebd1 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/MarshallTest.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/gentesting/unittests/MarshallTest.java @@ -10,8 +10,11 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.protobuf.FieldMask; +import com.google.protobuf.util.Durations; +import com.google.protobuf.util.Timestamps; +import java.text.ParseException; import java.util.*; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -21,7 +24,7 @@ @ExtendWith(MockitoExtension.class) public class MarshallTest { @Mock private ApiClient mockApiClient; - private ObjectMapper objectMapper; + private static final ObjectMapper objectMapper = SerDeUtils.createMapper(); static class MarshallTestCase { String name; @@ -35,13 +38,8 @@ static class MarshallTestCase { } } - @BeforeEach - void setUp() { - objectMapper = SerDeUtils.createMapper(); - } - static List marshallTestCases() - throws JsonProcessingException, JsonMappingException { + throws JsonProcessingException, JsonMappingException, ParseException { List cases = new ArrayList<>(); cases.add( new MarshallTestCase( @@ -98,17 +96,21 @@ static List marshallTestCases() cases.add( new MarshallTestCase( "OptionalDuration", - new OptionalFields().setDuration("3600s"), + new OptionalFields().setDuration(Durations.parse("3600s")), "{" + " \"duration\": \"3600s\"" + "}")); cases.add( new MarshallTestCase( "OptionalFieldMask", - new OptionalFields().setFieldMask("optional_string,optional_int32"), + new OptionalFields() + .setFieldMask( + FieldMask.newBuilder() + .addAllPaths(Arrays.asList("optional_string,optional_int32".split(", "))) + .build()), "{" + " \"field_mask\": \"optional_string,optional_int32\"" + "}")); cases.add( new MarshallTestCase( "OptionalTimestamp", - new OptionalFields().setTimestamp("2023-01-01T00:00:00Z"), + new OptionalFields().setTimestamp(Timestamps.parse("2023-01-01T00:00:00Z")), "{" + " \"timestamp\": \"2023-01-01T00:00:00Z\"" + "}")); cases.add( new MarshallTestCase( @@ -123,6 +125,70 @@ static List marshallTestCases() + " \"optional_bool\":true" + "}")); cases.add(new MarshallTestCase("RequiredFieldsNoInput", new RequiredFields(), "{}")); + cases.add( + new MarshallTestCase( + "RequiredFieldsExplicitDefaults", + new RequiredFields() + .setRequiredBool(false) + .setRequiredDuration(Durations.parse("0s")) + .setRequiredFieldMask( + FieldMask.newBuilder().addAllPaths(Arrays.asList("".split(", "))).build()) + .setRequiredInt32(0L) + .setRequiredInt64(0L) + .setRequiredListValue(new ArrayList<>()) + .setRequiredMessage(new NestedMessage()) + .setRequiredString("") + .setRequiredStruct(new HashMap<>()) + .setRequiredTimestamp(Timestamps.parse("1970-01-01T00:00:00Z")) + .setRequiredValue(objectMapper.readTree("{}")) + .setTestRequiredEnum(TestEnum.TEST_ENUM_ONE), + "{" + + " \"required_string\": \"\"," + + " \"required_int32\": 0," + + " \"required_int64\": 0," + + " \"required_bool\": false," + + " \"required_value\": {}," + + " \"required_list_value\": []," + + " \"required_struct\": {}," + + " \"required_message\": {}," + + " \"test_required_enum\": \"TEST_ENUM_ONE\"," + + " \"required_duration\": \"0s\"," + + " \"required_field_mask\": \"\"," + + " \"required_timestamp\": \"1970-01-01T00:00:00Z\"" + + "}")); + cases.add( + new MarshallTestCase( + "RequiredFieldsNonDefaults", + new RequiredFields() + .setRequiredBool(true) + .setRequiredDuration(Durations.parse("7200s")) + .setRequiredFieldMask( + FieldMask.newBuilder() + .addAllPaths(Arrays.asList("required_string,required_int32".split(", "))) + .build()) + .setRequiredInt32(42L) + .setRequiredInt64(1234567890123456789L) + .setRequiredListValue(new ArrayList<>()) + .setRequiredMessage(new NestedMessage()) + .setRequiredString("non_default_string") + .setRequiredStruct(new HashMap<>()) + .setRequiredTimestamp(Timestamps.parse("2023-12-31T23:59:59Z")) + .setRequiredValue(objectMapper.readTree("{}")) + .setTestRequiredEnum(TestEnum.TEST_ENUM_TWO), + "{" + + " \"required_string\": \"non_default_string\"," + + " \"required_int32\": 42," + + " \"required_int64\": 1234567890123456789," + + " \"required_bool\": true," + + " \"required_value\": {}," + + " \"required_list_value\": []," + + " \"required_struct\": {}," + + " \"required_message\": {}," + + " \"test_required_enum\": \"TEST_ENUM_TWO\"," + + " \"required_duration\": \"7200s\"," + + " \"required_field_mask\": \"required_string,required_int32\"," + + " \"required_timestamp\": \"2023-12-31T23:59:59Z\"" + + "}")); cases.add( new MarshallTestCase( "RequiredFieldsWithNestedMessage", @@ -181,19 +247,32 @@ static List marshallTestCases() cases.add( new MarshallTestCase( "RepeatedDuration", - new RepeatedFields().setRepeatedDuration(Arrays.asList("60s", "120s", "180s")), + new RepeatedFields() + .setRepeatedDuration( + Arrays.asList( + Durations.parse("60s"), Durations.parse("120s"), Durations.parse("180s"))), "{" + " \"repeated_duration\": [\"60s\", \"120s\", \"180s\"]" + "}")); cases.add( new MarshallTestCase( "RepeatedFieldMask", - new RepeatedFields().setRepeatedFieldMask(Arrays.asList("field1", "field2,field3")), + new RepeatedFields() + .setRepeatedFieldMask( + Arrays.asList( + FieldMask.newBuilder() + .addAllPaths(Arrays.asList("field1".split(", "))) + .build(), + FieldMask.newBuilder() + .addAllPaths(Arrays.asList("field2,field3".split(", "))) + .build())), "{" + " \"repeated_field_mask\": [\"field1\", \"field2,field3\"]" + "}")); cases.add( new MarshallTestCase( "RepeatedTimestamp", new RepeatedFields() .setRepeatedTimestamp( - Arrays.asList("2023-01-01T00:00:00Z", "2023-01-02T00:00:00Z")), + Arrays.asList( + Timestamps.parse("2023-01-01T00:00:00Z"), + Timestamps.parse("2023-01-02T00:00:00Z"))), "{" + " \"repeated_timestamp\": [\"2023-01-01T00:00:00Z\", \"2023-01-02T00:00:00Z\"]" + "}")); diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/GetResourceRequest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/GetResourceRequest.java index ac2e90ec1..cca3bc159 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/GetResourceRequest.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/GetResourceRequest.java @@ -6,6 +6,7 @@ import com.databricks.sdk.support.QueryParam; import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.google.protobuf.FieldMask; import java.util.Collection; import java.util.Objects; @@ -20,7 +21,7 @@ public class GetResourceRequest { */ @JsonIgnore @QueryParam("field_mask") - private String fieldMask; + private FieldMask fieldMask; /** */ @JsonIgnore @@ -61,12 +62,12 @@ public class GetResourceRequest { @QueryParam("repeated_query_param") private Collection repeatedQueryParam; - public GetResourceRequest setFieldMask(String fieldMask) { + public GetResourceRequest setFieldMask(FieldMask fieldMask) { this.fieldMask = fieldMask; return this; } - public String getFieldMask() { + public FieldMask getFieldMask() { return fieldMask; } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/UpdateResourceRequest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/UpdateResourceRequest.java index 96ccd80c3..201670a77 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/UpdateResourceRequest.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/httpcallv2/UpdateResourceRequest.java @@ -7,6 +7,7 @@ import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.protobuf.FieldMask; import java.util.Collection; import java.util.Objects; @@ -21,7 +22,7 @@ public class UpdateResourceRequest { */ @JsonIgnore @QueryParam("field_mask") - private String fieldMask; + private FieldMask fieldMask; /** */ @JsonIgnore private Boolean nestedPathParamBool; @@ -66,12 +67,12 @@ public class UpdateResourceRequest { @JsonProperty("resource") private Resource resource; - public UpdateResourceRequest setFieldMask(String fieldMask) { + public UpdateResourceRequest setFieldMask(FieldMask fieldMask) { this.fieldMask = fieldMask; return this; } - public String getFieldMask() { + public FieldMask getFieldMask() { return fieldMask; } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/NestedMessage.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/NestedMessage.java index d045ceb25..764a29858 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/NestedMessage.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/NestedMessage.java @@ -6,6 +6,8 @@ import com.databricks.sdk.support.QueryParam; import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.protobuf.Duration; +import com.google.protobuf.Timestamp; import java.util.Objects; @Generated @@ -13,7 +15,7 @@ public class NestedMessage { /** */ @JsonProperty("optional_duration") @QueryParam("optional_duration") - private String optionalDuration; + private Duration optionalDuration; /** */ @JsonProperty("optional_string") @@ -23,14 +25,14 @@ public class NestedMessage { /** */ @JsonProperty("optional_timestamp") @QueryParam("optional_timestamp") - private String optionalTimestamp; + private Timestamp optionalTimestamp; - public NestedMessage setOptionalDuration(String optionalDuration) { + public NestedMessage setOptionalDuration(Duration optionalDuration) { this.optionalDuration = optionalDuration; return this; } - public String getOptionalDuration() { + public Duration getOptionalDuration() { return optionalDuration; } @@ -43,12 +45,12 @@ public String getOptionalString() { return optionalString; } - public NestedMessage setOptionalTimestamp(String optionalTimestamp) { + public NestedMessage setOptionalTimestamp(Timestamp optionalTimestamp) { this.optionalTimestamp = optionalTimestamp; return this; } - public String getOptionalTimestamp() { + public Timestamp getOptionalTimestamp() { return optionalTimestamp; } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/OptionalFields.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/OptionalFields.java index 19caee741..f86cb107e 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/OptionalFields.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/OptionalFields.java @@ -6,6 +6,10 @@ import com.databricks.sdk.support.QueryParam; import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import com.google.protobuf.Duration; +import com.google.protobuf.FieldMask; +import com.google.protobuf.Timestamp; import java.util.Collection; import java.util.Map; import java.util.Objects; @@ -15,7 +19,7 @@ public class OptionalFields { /** */ @JsonProperty("duration") @QueryParam("duration") - private String duration; + private Duration duration; /** * The field mask must be a single string, with multiple fields separated by commas (no spaces). @@ -26,7 +30,7 @@ public class OptionalFields { */ @JsonProperty("field_mask") @QueryParam("field_mask") - private String fieldMask; + private FieldMask fieldMask; /** Legacy Well Known types */ @JsonProperty("legacy_duration") @@ -52,7 +56,7 @@ public class OptionalFields { /** */ @JsonProperty("list_value") @QueryParam("list_value") - private Collection listValue; + private Collection listValue; /** Lint disable reason: This is a dummy field used to test SDK Generation logic. */ @JsonProperty("map") @@ -87,7 +91,7 @@ public class OptionalFields { /** */ @JsonProperty("struct") @QueryParam("struct") - private Map structValue; + private Map structValue; /** */ @JsonProperty("test_enum") @@ -97,28 +101,28 @@ public class OptionalFields { /** */ @JsonProperty("timestamp") @QueryParam("timestamp") - private String timestamp; + private Timestamp timestamp; /** */ @JsonProperty("value") @QueryParam("value") - private Object /* MISSING TYPE */ value; + private JsonNode value; - public OptionalFields setDuration(String duration) { + public OptionalFields setDuration(Duration duration) { this.duration = duration; return this; } - public String getDuration() { + public Duration getDuration() { return duration; } - public OptionalFields setFieldMask(String fieldMask) { + public OptionalFields setFieldMask(FieldMask fieldMask) { this.fieldMask = fieldMask; return this; } - public String getFieldMask() { + public FieldMask getFieldMask() { return fieldMask; } @@ -149,12 +153,12 @@ public String getLegacyTimestamp() { return legacyTimestamp; } - public OptionalFields setListValue(Collection listValue) { + public OptionalFields setListValue(Collection listValue) { this.listValue = listValue; return this; } - public Collection getListValue() { + public Collection getListValue() { return listValue; } @@ -212,12 +216,12 @@ public String getOptionalString() { return optionalString; } - public OptionalFields setStruct(Map structValue) { + public OptionalFields setStruct(Map structValue) { this.structValue = structValue; return this; } - public Map getStruct() { + public Map getStruct() { return structValue; } @@ -230,21 +234,21 @@ public TestEnum getTestEnum() { return testEnum; } - public OptionalFields setTimestamp(String timestamp) { + public OptionalFields setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; return this; } - public String getTimestamp() { + public Timestamp getTimestamp() { return timestamp; } - public OptionalFields setValue(Object /* MISSING TYPE */ value) { + public OptionalFields setValue(JsonNode value) { this.value = value; return this; } - public Object /* MISSING TYPE */ getValue() { + public JsonNode getValue() { return value; } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RepeatedFields.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RepeatedFields.java index 4595b4a73..bfed3a4ac 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RepeatedFields.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RepeatedFields.java @@ -6,6 +6,10 @@ import com.databricks.sdk.support.QueryParam; import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import com.google.protobuf.Duration; +import com.google.protobuf.FieldMask; +import com.google.protobuf.Timestamp; import java.util.Collection; import java.util.Map; import java.util.Objects; @@ -20,12 +24,12 @@ public class RepeatedFields { /** */ @JsonProperty("repeated_duration") @QueryParam("repeated_duration") - private Collection repeatedDuration; + private Collection repeatedDuration; /** */ @JsonProperty("repeated_field_mask") @QueryParam("repeated_field_mask") - private Collection repeatedFieldMask; + private Collection repeatedFieldMask; /** */ @JsonProperty("repeated_int32") @@ -40,7 +44,7 @@ public class RepeatedFields { /** */ @JsonProperty("repeated_list_value") @QueryParam("repeated_list_value") - private Collection> repeatedListValue; + private Collection> repeatedListValue; /** */ @JsonProperty("repeated_message") @@ -55,17 +59,17 @@ public class RepeatedFields { /** */ @JsonProperty("repeated_struct") @QueryParam("repeated_struct") - private Collection> repeatedStruct; + private Collection> repeatedStruct; /** */ @JsonProperty("repeated_timestamp") @QueryParam("repeated_timestamp") - private Collection repeatedTimestamp; + private Collection repeatedTimestamp; /** */ @JsonProperty("repeated_value") @QueryParam("repeated_value") - private Collection repeatedValue; + private Collection repeatedValue; /** */ @JsonProperty("test_repeated_enum") @@ -81,21 +85,21 @@ public Collection getRepeatedBool() { return repeatedBool; } - public RepeatedFields setRepeatedDuration(Collection repeatedDuration) { + public RepeatedFields setRepeatedDuration(Collection repeatedDuration) { this.repeatedDuration = repeatedDuration; return this; } - public Collection getRepeatedDuration() { + public Collection getRepeatedDuration() { return repeatedDuration; } - public RepeatedFields setRepeatedFieldMask(Collection repeatedFieldMask) { + public RepeatedFields setRepeatedFieldMask(Collection repeatedFieldMask) { this.repeatedFieldMask = repeatedFieldMask; return this; } - public Collection getRepeatedFieldMask() { + public Collection getRepeatedFieldMask() { return repeatedFieldMask; } @@ -117,13 +121,12 @@ public Collection getRepeatedInt64() { return repeatedInt64; } - public RepeatedFields setRepeatedListValue( - Collection> repeatedListValue) { + public RepeatedFields setRepeatedListValue(Collection> repeatedListValue) { this.repeatedListValue = repeatedListValue; return this; } - public Collection> getRepeatedListValue() { + public Collection> getRepeatedListValue() { return repeatedListValue; } @@ -145,31 +148,30 @@ public Collection getRepeatedString() { return repeatedString; } - public RepeatedFields setRepeatedStruct( - Collection> repeatedStruct) { + public RepeatedFields setRepeatedStruct(Collection> repeatedStruct) { this.repeatedStruct = repeatedStruct; return this; } - public Collection> getRepeatedStruct() { + public Collection> getRepeatedStruct() { return repeatedStruct; } - public RepeatedFields setRepeatedTimestamp(Collection repeatedTimestamp) { + public RepeatedFields setRepeatedTimestamp(Collection repeatedTimestamp) { this.repeatedTimestamp = repeatedTimestamp; return this; } - public Collection getRepeatedTimestamp() { + public Collection getRepeatedTimestamp() { return repeatedTimestamp; } - public RepeatedFields setRepeatedValue(Collection repeatedValue) { + public RepeatedFields setRepeatedValue(Collection repeatedValue) { this.repeatedValue = repeatedValue; return this; } - public Collection getRepeatedValue() { + public Collection getRepeatedValue() { return repeatedValue; } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RequiredFields.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RequiredFields.java index 1caa4fa2b..6978baf6e 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RequiredFields.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/jsonmarshallv2/RequiredFields.java @@ -6,6 +6,10 @@ import com.databricks.sdk.support.QueryParam; import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import com.google.protobuf.Duration; +import com.google.protobuf.FieldMask; +import com.google.protobuf.Timestamp; import java.util.Collection; import java.util.Map; import java.util.Objects; @@ -20,7 +24,7 @@ public class RequiredFields { /** */ @JsonProperty("required_duration") @QueryParam("required_duration") - private String requiredDuration; + private Duration requiredDuration; /** * The field mask must be a single string, with multiple fields separated by commas (no spaces). @@ -31,7 +35,7 @@ public class RequiredFields { */ @JsonProperty("required_field_mask") @QueryParam("required_field_mask") - private String requiredFieldMask; + private FieldMask requiredFieldMask; /** */ @JsonProperty("required_int32") @@ -46,7 +50,7 @@ public class RequiredFields { /** */ @JsonProperty("required_list_value") @QueryParam("required_list_value") - private Collection requiredListValue; + private Collection requiredListValue; /** */ @JsonProperty("required_message") @@ -61,17 +65,17 @@ public class RequiredFields { /** */ @JsonProperty("required_struct") @QueryParam("required_struct") - private Map requiredStruct; + private Map requiredStruct; /** */ @JsonProperty("required_timestamp") @QueryParam("required_timestamp") - private String requiredTimestamp; + private Timestamp requiredTimestamp; /** */ @JsonProperty("required_value") @QueryParam("required_value") - private Object /* MISSING TYPE */ requiredValue; + private JsonNode requiredValue; /** */ @JsonProperty("test_required_enum") @@ -87,21 +91,21 @@ public Boolean getRequiredBool() { return requiredBool; } - public RequiredFields setRequiredDuration(String requiredDuration) { + public RequiredFields setRequiredDuration(Duration requiredDuration) { this.requiredDuration = requiredDuration; return this; } - public String getRequiredDuration() { + public Duration getRequiredDuration() { return requiredDuration; } - public RequiredFields setRequiredFieldMask(String requiredFieldMask) { + public RequiredFields setRequiredFieldMask(FieldMask requiredFieldMask) { this.requiredFieldMask = requiredFieldMask; return this; } - public String getRequiredFieldMask() { + public FieldMask getRequiredFieldMask() { return requiredFieldMask; } @@ -123,13 +127,12 @@ public Long getRequiredInt64() { return requiredInt64; } - public RequiredFields setRequiredListValue( - Collection requiredListValue) { + public RequiredFields setRequiredListValue(Collection requiredListValue) { this.requiredListValue = requiredListValue; return this; } - public Collection getRequiredListValue() { + public Collection getRequiredListValue() { return requiredListValue; } @@ -151,30 +154,30 @@ public String getRequiredString() { return requiredString; } - public RequiredFields setRequiredStruct(Map requiredStruct) { + public RequiredFields setRequiredStruct(Map requiredStruct) { this.requiredStruct = requiredStruct; return this; } - public Map getRequiredStruct() { + public Map getRequiredStruct() { return requiredStruct; } - public RequiredFields setRequiredTimestamp(String requiredTimestamp) { + public RequiredFields setRequiredTimestamp(Timestamp requiredTimestamp) { this.requiredTimestamp = requiredTimestamp; return this; } - public String getRequiredTimestamp() { + public Timestamp getRequiredTimestamp() { return requiredTimestamp; } - public RequiredFields setRequiredValue(Object /* MISSING TYPE */ requiredValue) { + public RequiredFields setRequiredValue(JsonNode requiredValue) { this.requiredValue = requiredValue; return this; } - public Object /* MISSING TYPE */ getRequiredValue() { + public JsonNode getRequiredValue() { return requiredValue; }