diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/ComputeSize.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/ComputeSize.java index ff5b63350..ea90ad401 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/ComputeSize.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/apps/ComputeSize.java @@ -7,6 +7,5 @@ @Generated public enum ComputeSize { LARGE, - LIQUID, MEDIUM, } 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 ffbf0fff6..95d7c6744 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 @@ -15,7 +15,6 @@ public enum ConnectionType { HTTP, MYSQL, ORACLE, - PALANTIR, POSTGRESQL, POWER_BI, REDSHIFT, 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 d947e19aa..c40d845f3 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 @@ -41,7 +41,6 @@ public enum SecurableKind { TABLE_FOREIGN_MYSQL, TABLE_FOREIGN_NETSUITE, TABLE_FOREIGN_ORACLE, - TABLE_FOREIGN_PALANTIR, TABLE_FOREIGN_POSTGRESQL, TABLE_FOREIGN_REDSHIFT, TABLE_FOREIGN_SALESFORCE, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/TerminationReasonCode.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/TerminationReasonCode.java index 70f27a572..8d1a96478 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/TerminationReasonCode.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/compute/TerminationReasonCode.java @@ -71,7 +71,6 @@ public enum TerminationReasonCode { DOCKER_IMAGE_PULL_FAILURE, DOCKER_IMAGE_TOO_LARGE_FOR_INSTANCE_EXCEPTION, DOCKER_INVALID_OS_EXCEPTION, - DRIVER_DNS_RESOLUTION_FAILURE, DRIVER_EVICTION, DRIVER_LAUNCH_TIMEOUT, DRIVER_NODE_UNREACHABLE, @@ -146,8 +145,6 @@ public enum TerminationReasonCode { NETWORK_CHECK_STORAGE_FAILURE_DUE_TO_MISCONFIG, NETWORK_CONFIGURATION_FAILURE, NFS_MOUNT_FAILURE, - NO_ACTIVATED_K8S, - NO_ACTIVATED_K8S_TESTING_TAG, NO_MATCHED_K8S, NO_MATCHED_K8S_TESTING_TAG, NPIP_TUNNEL_SETUP_FAILURE, @@ -160,7 +157,6 @@ public enum TerminationReasonCode { SECRET_CREATION_FAILURE, SECRET_PERMISSION_DENIED, SECRET_RESOLUTION_ERROR, - SECURITY_AGENTS_FAILED_INITIAL_VERIFICATION, SECURITY_DAEMON_REGISTRATION_EXCEPTION, SELF_BOOTSTRAP_FAILURE, SERVERLESS_LONG_RUNNING_TERMINATED, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/dashboards/MessageErrorType.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/dashboards/MessageErrorType.java index 75e28eb70..f6f7a1df0 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/dashboards/MessageErrorType.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/dashboards/MessageErrorType.java @@ -36,7 +36,6 @@ public enum MessageErrorType { INTERNAL_CATALOG_PATH_OVERLAP_EXCEPTION, INVALID_CERTIFIED_ANSWER_FUNCTION_EXCEPTION, INVALID_CERTIFIED_ANSWER_IDENTIFIER_EXCEPTION, - INVALID_CHAT_COMPLETION_ARGUMENTS_JSON_EXCEPTION, INVALID_CHAT_COMPLETION_JSON_EXCEPTION, INVALID_COMPLETION_REQUEST_EXCEPTION, INVALID_FUNCTION_CALL_EXCEPTION, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/pipelines/IngestionSourceType.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/pipelines/IngestionSourceType.java index ca1ccf7cb..bf68ec227 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/pipelines/IngestionSourceType.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/pipelines/IngestionSourceType.java @@ -7,29 +7,17 @@ @Generated public enum IngestionSourceType { BIGQUERY, - CONFLUENCE, DYNAMICS365, - FOREIGN_CATALOG, GA4_RAW_DATA, - GOOGLE_ADS, - GUIDEWIRE, - HUBSPOT, MANAGED_POSTGRESQL, - META_MARKETING, MYSQL, NETSUITE, ORACLE, POSTGRESQL, - REDSHIFT, SALESFORCE, - SALESFORCE_MARKETING_CLOUD, SERVICENOW, SHAREPOINT, - SQLDW, SQLSERVER, TERADATA, - TIKTOK_ADS, - WORKDAY_HCM, WORKDAY_RAAS, - ZENDESK, } diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/settings/NccPrivateEndpointRulePrivateLinkConnectionState.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/settings/NccPrivateEndpointRulePrivateLinkConnectionState.java index d2c3d1407..0b0bcdebd 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/settings/NccPrivateEndpointRulePrivateLinkConnectionState.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/settings/NccPrivateEndpointRulePrivateLinkConnectionState.java @@ -6,8 +6,6 @@ @Generated public enum NccPrivateEndpointRulePrivateLinkConnectionState { - CREATE_FAILED, - CREATING, DISCONNECTED, ESTABLISHED, EXPIRED, diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/TerminationReasonCode.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/TerminationReasonCode.java index d6a04f45a..ddd2de72a 100755 --- a/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/TerminationReasonCode.java +++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/service/sql/TerminationReasonCode.java @@ -71,7 +71,6 @@ public enum TerminationReasonCode { DOCKER_IMAGE_PULL_FAILURE, DOCKER_IMAGE_TOO_LARGE_FOR_INSTANCE_EXCEPTION, DOCKER_INVALID_OS_EXCEPTION, - DRIVER_DNS_RESOLUTION_FAILURE, DRIVER_EVICTION, DRIVER_LAUNCH_TIMEOUT, DRIVER_NODE_UNREACHABLE, @@ -146,8 +145,6 @@ public enum TerminationReasonCode { NETWORK_CHECK_STORAGE_FAILURE_DUE_TO_MISCONFIG, NETWORK_CONFIGURATION_FAILURE, NFS_MOUNT_FAILURE, - NO_ACTIVATED_K8S, - NO_ACTIVATED_K8S_TESTING_TAG, NO_MATCHED_K8S, NO_MATCHED_K8S_TESTING_TAG, NPIP_TUNNEL_SETUP_FAILURE, @@ -160,7 +157,6 @@ public enum TerminationReasonCode { SECRET_CREATION_FAILURE, SECRET_PERMISSION_DENIED, SECRET_RESOLUTION_ERROR, - SECURITY_AGENTS_FAILED_INITIAL_VERIFICATION, SECURITY_DAEMON_REGISTRATION_EXCEPTION, SELF_BOOTSTRAP_FAILURE, SERVERLESS_LONG_RUNNING_TERMINATED, 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 e885ce52a..8ace443c7 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( @@ -128,56 +130,60 @@ static List marshallTestCases() "RequiredFieldsExplicitDefaults", new RequiredFields() .setRequiredBool(false) - .setRequiredDuration("0s") - .setRequiredFieldMask("") + .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("1970-01-01T00:00:00Z") - .setRequiredValue("{}") + .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\"" - + " }")); + + " \"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("7200s") - .setRequiredFieldMask("required_string,required_int32") + .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("2023-12-31T23:59:59Z") - .setRequiredValue("{}") + .setRequiredTimestamp(Timestamps.parse("2023-12-31T23:59:59Z")) + .setRequiredValue(objectMapper.readTree("{\"key\": \"value\"}")) .setTestRequiredEnum(TestEnum.TEST_ENUM_TWO), "{" + " \"required_string\": \"non_default_string\"," + " \"required_int32\": 42," + " \"required_int64\": 1234567890123456789," + " \"required_bool\": true," - + " \"required_message\": {}," - + " \"required_value\": \"{}\"," + + " \"required_value\": {\"key\": \"value\"}," + " \"required_list_value\": []," + " \"required_struct\": {}," + + " \"required_message\": {}," + " \"test_required_enum\": \"TEST_ENUM_TWO\"," + " \"required_duration\": \"7200s\"," + " \"required_field_mask\": \"required_string,required_int32\"," @@ -241,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; } diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/CreateTestResourceOperation.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/CreateTestResourceOperation.java index b3e1f28ed..179d17afb 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/CreateTestResourceOperation.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/CreateTestResourceOperation.java @@ -21,7 +21,6 @@ @Generated public class CreateTestResourceOperation { private static final Logger LOG = LoggerFactory.getLogger(CreateTestResourceOperation.class); - private static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(20); private final LroTestingService impl; private Operation operation; @@ -34,8 +33,8 @@ public CreateTestResourceOperation(LroTestingService impl, Operation operation) } /** - * Wait for the operation to complete and return the resulting TestResource. Uses the default - * timeout of 20 minutes. + * Wait for the operation to complete and return the resulting TestResource. Waits indefinitely if + * no timeout is specified. * * @return the created TestResource * @throws TimeoutException if the operation doesn't complete within the timeout @@ -54,8 +53,11 @@ public TestResource waitForCompletion() throws TimeoutException { * @throws DatabricksException if the operation fails */ public TestResource waitForCompletion(Optional options) throws TimeoutException { - Duration timeout = options.flatMap(LroOptions::getTimeout).orElse(DEFAULT_TIMEOUT); - long deadline = System.currentTimeMillis() + timeout.toMillis(); + Optional timeout = options.flatMap(LroOptions::getTimeout); + long deadline = + timeout.isPresent() + ? System.currentTimeMillis() + timeout.get().toMillis() + : Long.MAX_VALUE; String statusMessage = "polling operation..."; int attempt = 1; @@ -107,8 +109,11 @@ public TestResource waitForCompletion(Optional options) throws Timeo attempt++; } - throw new TimeoutException( - String.format("Operation timed out after %s: %s", timeout, statusMessage)); + String timeoutMessage = + timeout.isPresent() + ? String.format("Operation timed out after %s: %s", timeout.get(), statusMessage) + : String.format("Operation timed out: %s", statusMessage); + throw new TimeoutException(timeoutMessage); } /** diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DatabricksServiceExceptionWithDetailsProto.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DatabricksServiceExceptionWithDetailsProto.java index e2254a076..011067330 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DatabricksServiceExceptionWithDetailsProto.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DatabricksServiceExceptionWithDetailsProto.java @@ -8,13 +8,7 @@ import java.util.Collection; import java.util.Objects; -/** - * Serialization format for DatabricksServiceException with error details. This message doesn't work - * for ScalaPB-04 as google.protobuf.Any is only available to ScalaPB-09. Note the definition of - * this message should be in sync with DatabricksServiceExceptionProto defined in - * /api-base/proto/legacy/databricks.proto except the later one doesn't have the error details field - * defined. - */ +/** Databricks Error that is returned by all Databricks APIs. */ @Generated public class DatabricksServiceExceptionWithDetailsProto { /** diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DeleteTestResourceOperation.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DeleteTestResourceOperation.java index df2943fc8..722858c22 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DeleteTestResourceOperation.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/DeleteTestResourceOperation.java @@ -21,7 +21,6 @@ @Generated public class DeleteTestResourceOperation { private static final Logger LOG = LoggerFactory.getLogger(DeleteTestResourceOperation.class); - private static final Duration DEFAULT_TIMEOUT = Duration.ofMinutes(20); private final LroTestingService impl; private Operation operation; @@ -34,8 +33,8 @@ public DeleteTestResourceOperation(LroTestingService impl, Operation operation) } /** - * Wait for the operation to complete and return the resulting . Uses the default timeout of 20 - * minutes. + * Wait for the operation to complete and return the resulting . Waits indefinitely if no timeout + * is specified. * * @return the created * @throws TimeoutException if the operation doesn't complete within the timeout @@ -54,8 +53,11 @@ public void waitForCompletion() throws TimeoutException { * @throws DatabricksException if the operation fails */ public void waitForCompletion(Optional options) throws TimeoutException { - Duration timeout = options.flatMap(LroOptions::getTimeout).orElse(DEFAULT_TIMEOUT); - long deadline = System.currentTimeMillis() + timeout.toMillis(); + Optional timeout = options.flatMap(LroOptions::getTimeout); + long deadline = + timeout.isPresent() + ? System.currentTimeMillis() + timeout.get().toMillis() + : Long.MAX_VALUE; String statusMessage = "polling operation..."; int attempt = 1; @@ -106,8 +108,11 @@ public void waitForCompletion(Optional options) throws TimeoutExcept attempt++; } - throw new TimeoutException( - String.format("Operation timed out after %s: %s", timeout, statusMessage)); + String timeoutMessage = + timeout.isPresent() + ? String.format("Operation timed out after %s: %s", timeout.get(), statusMessage) + : String.format("Operation timed out: %s", statusMessage); + throw new TimeoutException(timeoutMessage); } /** diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/Operation.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/Operation.java index 025034b47..0f6aefe5b 100755 --- a/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/Operation.java +++ b/databricks-sdk-java/src/test/java/com/databricks/sdk/service/lrotesting/Operation.java @@ -24,8 +24,7 @@ public class Operation { /** * Service-specific metadata associated with the operation. It typically contains progress * information and common metadata such as create time. Some services might not provide such - * metadata. Any method that returns a long-running operation should document the metadata type, - * if any. + * metadata. */ @JsonProperty("metadata") private Object metadata; @@ -34,21 +33,11 @@ public class Operation { * The server-assigned name, which is only unique within the same service that originally returns * it. If you use the default HTTP mapping, the `name` should be a resource name ending with * `operations/{unique_id}`. - * - *

Note: multi-segment resource names are not yet supported in the RPC framework and SDK/TF. - * Until that support is added, `name` must be string without internal `/` separators. */ @JsonProperty("name") private String name; - /** - * The normal, successful response of the operation. If the original method returns no data on - * success, such as `Delete`, the response is `google.protobuf.Empty`. If the original method is - * standard `Get`/`Create`/`Update`, the response should be the resource. For other methods, the - * response should have the type `XxxResponse`, where `Xxx` is the original method name. For - * example, if the original method name is `TakeSnapshot()`, the inferred response type is - * `TakeSnapshotResponse`. - */ + /** The normal, successful response of the operation. */ @JsonProperty("response") private Object response;