diff --git a/Makefile b/Makefile
index a6b175dd4be..1085b0624b8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ CLIENT_JARS_BUCKET="s3://treeverse-clients-us-east/"
# https://openapi-generator.tech
OPENAPI_LEGACY_GENERATOR_IMAGE=openapitools/openapi-generator-cli:v5.3.0
OPENAPI_LEGACY_GENERATOR=$(DOCKER) run --user $(UID_GID) --rm -v $(shell pwd):/mnt $(OPENAPI_LEGACY_GENERATOR_IMAGE)
-OPENAPI_GENERATOR_IMAGE=treeverse/openapi-generator-cli:v7.0.0.1
+OPENAPI_GENERATOR_IMAGE=openapitools/openapi-generator-cli:v7.8.0
OPENAPI_GENERATOR=$(DOCKER) run --user $(UID_GID) --rm -v $(shell pwd):/mnt $(OPENAPI_GENERATOR_IMAGE)
-OPENAPI_RUST_GENERATOR_IMAGE=openapitools/openapi-generator-cli:v7.5.0
+OPENAPI_RUST_GENERATOR_IMAGE=openapitools/openapi-generator-cli:v7.8.0
OPENAPI_RUST_GENERATOR=$(DOCKER) run --user $(UID_GID) --rm -v $(shell pwd):/mnt $(OPENAPI_RUST_GENERATOR_IMAGE)
PY_OPENAPI_GENERATOR=$(DOCKER) run -e PYTHON_POST_PROCESS_FILE="/mnt/clients/python/scripts/pydantic.sh" --user $(UID_GID) --rm -v $(shell pwd):/mnt $(OPENAPI_GENERATOR_IMAGE)
diff --git a/clients/java/.openapi-generator/VERSION b/clients/java/.openapi-generator/VERSION
index 4122521804f..09a6d30847d 100644
--- a/clients/java/.openapi-generator/VERSION
+++ b/clients/java/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
\ No newline at end of file
+7.8.0
diff --git a/clients/java/README.md b/clients/java/README.md
index 805e4947aec..91814049bd3 100644
--- a/clients/java/README.md
+++ b/clients/java/README.md
@@ -2,6 +2,7 @@
lakeFS API
- API version: 1.0.0
+ - Generator version: 7.8.0
lakeFS HTTP API
diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
index f991b4f0e81..c4e24805478 100644
--- a/clients/java/api/openapi.yaml
+++ b/clients/java/api/openapi.yaml
@@ -53,7 +53,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/setup_lakefs:
get:
operationId: getSetupState
@@ -76,7 +77,8 @@ paths:
summary: check if the lakeFS installation is already set up
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: setup
requestBody:
@@ -117,7 +119,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/user:
get:
operationId: getCurrentUser
@@ -131,7 +134,8 @@ paths:
summary: get current user
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/login:
post:
operationId: login
@@ -173,7 +177,8 @@ paths:
tags:
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/external/principal/login:
post:
operationId: externalPrincipalLogin
@@ -228,7 +233,8 @@ paths:
- experimental
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/sts/login:
post:
operationId: stsLogin
@@ -264,7 +270,8 @@ paths:
tags:
- experimental
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/capabilities:
get:
operationId: getAuthCapabilities
@@ -287,7 +294,8 @@ paths:
summary: list authentication capabilities supported
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users:
get:
operationId: listUsers
@@ -343,7 +351,8 @@ paths:
summary: list users
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createUser
requestBody:
@@ -388,7 +397,8 @@ paths:
tags:
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}:
delete:
operationId: deleteUser
@@ -426,7 +436,8 @@ paths:
summary: delete user
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getUser
parameters:
@@ -467,7 +478,8 @@ paths:
summary: get user
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups:
get:
operationId: listGroups
@@ -523,7 +535,8 @@ paths:
summary: list groups
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createGroup
requestBody:
@@ -562,7 +575,8 @@ paths:
tags:
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups/{groupId}:
delete:
operationId: deleteGroup
@@ -600,7 +614,8 @@ paths:
summary: delete group
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getGroup
parameters:
@@ -641,7 +656,8 @@ paths:
summary: get group
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/policies:
get:
operationId: listPolicies
@@ -697,7 +713,8 @@ paths:
summary: list policies
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createPolicy
requestBody:
@@ -743,7 +760,8 @@ paths:
tags:
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/policies/{policyId}:
delete:
operationId: deletePolicy
@@ -781,7 +799,8 @@ paths:
summary: delete policy
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getPolicy
parameters:
@@ -822,7 +841,8 @@ paths:
summary: get policy
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: updatePolicy
parameters:
@@ -876,7 +896,8 @@ paths:
tags:
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups/{groupId}/members:
get:
operationId: listGroupMembers
@@ -939,7 +960,8 @@ paths:
summary: list group members
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups/{groupId}/members/{userId}:
delete:
operationId: deleteGroupMembership
@@ -984,7 +1006,8 @@ paths:
summary: delete group membership
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: addGroupMembership
parameters:
@@ -1028,7 +1051,8 @@ paths:
summary: add group membership
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/credentials:
get:
operationId: listUserCredentials
@@ -1097,7 +1121,8 @@ paths:
summary: list user credentials
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createCredentials
parameters:
@@ -1138,7 +1163,8 @@ paths:
summary: create credentials
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/credentials/{accessKeyId}:
delete:
operationId: deleteCredentials
@@ -1183,7 +1209,8 @@ paths:
summary: delete credentials
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getCredentials
parameters:
@@ -1231,7 +1258,8 @@ paths:
summary: get credentials
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/groups:
get:
operationId: listUserGroups
@@ -1300,7 +1328,8 @@ paths:
summary: list user groups
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/policies:
get:
operationId: listUserPolicies
@@ -1379,7 +1408,8 @@ paths:
summary: list user policies
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/policies/{policyId}:
delete:
operationId: detachPolicyFromUser
@@ -1424,7 +1454,8 @@ paths:
summary: detach policy from user
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: attachPolicyToUser
parameters:
@@ -1468,7 +1499,8 @@ paths:
summary: attach policy to user
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/external/principals:
delete:
operationId: deleteUserExternalPrincipal
@@ -1515,7 +1547,8 @@ paths:
- auth
- external
- experimental
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createUserExternalPrincipal
parameters:
@@ -1574,7 +1607,8 @@ paths:
- external
- experimental
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/users/{userId}/external/principals/ls:
get:
operationId: listUserExternalPrincipals
@@ -1645,7 +1679,8 @@ paths:
- auth
- external
- experimental
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/external/principals:
get:
operationId: getExternalPrincipal
@@ -1689,7 +1724,8 @@ paths:
- auth
- external
- experimental
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups/{groupId}/policies:
get:
operationId: listGroupPolicies
@@ -1758,7 +1794,8 @@ paths:
summary: list group policies
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups/{groupId}/policies/{policyId}:
delete:
operationId: detachPolicyFromGroup
@@ -1803,7 +1840,8 @@ paths:
summary: detach policy from group
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: attachPolicyToGroup
parameters:
@@ -1847,7 +1885,8 @@ paths:
summary: attach policy to group
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
/auth/groups/{groupId}/acl:
get:
operationId: getGroupACL
@@ -1889,7 +1928,8 @@ paths:
summary: get ACL of group
tags:
- auth
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: setGroupACL
parameters:
@@ -1933,7 +1973,8 @@ paths:
tags:
- auth
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories:
get:
operationId: listRepositories
@@ -1989,7 +2030,8 @@ paths:
summary: list repositories
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createRepository
parameters:
@@ -2046,7 +2088,8 @@ paths:
tags:
- repositories
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}:
delete:
operationId: deleteRepository
@@ -2093,7 +2136,8 @@ paths:
summary: delete repository
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getRepository
parameters:
@@ -2134,7 +2178,8 @@ paths:
summary: get repository
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/metadata:
delete:
description: |
@@ -2175,7 +2220,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getRepositoryMetadata
parameters:
@@ -2216,7 +2262,8 @@ paths:
summary: get repository metadata
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
description: |
Set repository metadata. This will only add or update the provided keys, and will not remove any existing keys.
@@ -2262,7 +2309,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/settings/gc_rules:
delete:
operationId: deleteGCRules
@@ -2305,7 +2353,8 @@ paths:
description: Internal Server Error
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getGCRules
parameters:
@@ -2346,7 +2395,8 @@ paths:
summary: get repository GC rules
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: setGCRules
parameters:
@@ -2395,7 +2445,8 @@ paths:
tags:
- repositories
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/settings/branch_protection:
get:
operationId: getBranchProtectionRules
@@ -2446,7 +2497,8 @@ paths:
summary: get branch protection rules
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: setBranchProtectionRules
parameters:
@@ -2518,7 +2570,8 @@ paths:
tags:
- repositories
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/dump:
put:
operationId: dumpRefs
@@ -2568,7 +2621,8 @@ paths:
Deprecated: a new API will introduce long running operations
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/restore:
put:
operationId: restoreRefs
@@ -2621,7 +2675,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/dump:
get:
operationId: dumpStatus
@@ -2676,7 +2731,8 @@ paths:
summary: Status of a repository dump task
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: dumpSubmit
parameters:
@@ -2722,7 +2778,8 @@ paths:
\ the backup to the object store."
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/restore:
get:
operationId: restoreStatus
@@ -2777,7 +2834,8 @@ paths:
summary: Status of a restore request
tags:
- repositories
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: restoreSubmit
parameters:
@@ -2835,7 +2893,8 @@ paths:
tags:
- repositories
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/tags:
get:
operationId: listTags
@@ -2904,7 +2963,8 @@ paths:
summary: list tags
tags:
- tags
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createTag
parameters:
@@ -2970,7 +3030,8 @@ paths:
tags:
- tags
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/tags/{tag}:
delete:
operationId: deleteTag
@@ -3028,7 +3089,8 @@ paths:
summary: delete tag
tags:
- tags
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getTag
parameters:
@@ -3076,7 +3138,8 @@ paths:
summary: get tag
tags:
- tags
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches:
get:
operationId: listBranches
@@ -3145,7 +3208,8 @@ paths:
summary: list branches
tags:
- branches
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: createBranch
parameters:
@@ -3211,7 +3275,9 @@ paths:
tags:
- branches
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
+ - text/html
/repositories/{repository}/refs/{ref}/commits:
get:
operationId: logCommits
@@ -3338,7 +3404,8 @@ paths:
\ all commits."
tags:
- refs
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/commits:
post:
operationId: commit
@@ -3427,7 +3494,8 @@ paths:
tags:
- commits
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/commits:
post:
operationId: CreateCommitRecord
@@ -3484,7 +3552,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}:
delete:
operationId: deleteBranch
@@ -3543,7 +3612,8 @@ paths:
summary: delete branch
tags:
- branches
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: getBranch
parameters:
@@ -3591,7 +3661,8 @@ paths:
summary: get branch
tags:
- branches
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
operationId: resetBranch
parameters:
@@ -3654,7 +3725,8 @@ paths:
tags:
- branches
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/hard_reset:
put:
description: Relocate branch to refer to ref. Branch must not contain uncommitted
@@ -3729,7 +3801,8 @@ paths:
summary: hard reset branch
tags:
- experimental
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/revert:
post:
operationId: revertBranch
@@ -3799,7 +3872,8 @@ paths:
tags:
- branches
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/cherry-pick:
post:
operationId: cherryPick
@@ -3873,7 +3947,8 @@ paths:
tags:
- branches
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{sourceRef}/merge/{destinationBranch}:
get:
operationId: findMergeBase
@@ -3937,7 +4012,8 @@ paths:
summary: find the merge base for 2 references
tags:
- refs
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: mergeIntoBranch
parameters:
@@ -4026,7 +4102,8 @@ paths:
tags:
- refs
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/diff:
get:
operationId: diffBranch
@@ -4110,7 +4187,8 @@ paths:
summary: diff branch
tags:
- branches
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{leftRef}/diff/{rightRef}:
get:
operationId: diffRefs
@@ -4215,7 +4293,8 @@ paths:
summary: diff references
tags:
- refs
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/commits/{commitId}:
get:
operationId: getCommit
@@ -4264,7 +4343,8 @@ paths:
summary: get commit
tags:
- commits
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{ref}/objects:
get:
operationId: getObject
@@ -4419,7 +4499,9 @@ paths:
summary: get object content
tags:
- objects
- x-accepts: application/json
+ x-accepts:
+ - application/json
+ - application/octet-stream
head:
operationId: headObject
parameters:
@@ -4516,7 +4598,8 @@ paths:
summary: check if object exists
tags:
- objects
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/staging/pmpu:
post:
description: |
@@ -4591,7 +4674,8 @@ paths:
summary: Initiate a multipart upload
tags:
- experimental
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/staging/pmpu/{uploadId}:
delete:
description: Aborts a presign multipart upload.
@@ -4664,7 +4748,8 @@ paths:
tags:
- experimental
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
description: Completes a presign multipart upload by assembling the uploaded
parts.
@@ -4747,7 +4832,8 @@ paths:
tags:
- experimental
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/staging/backing:
get:
operationId: getPhysicalAddress
@@ -4811,7 +4897,8 @@ paths:
summary: generate an address to which the client can upload an object
tags:
- staging
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
description: |
Link the physical address with the path in lakeFS, creating an uncommitted change.
@@ -4911,7 +4998,8 @@ paths:
tags:
- staging
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/import:
delete:
operationId: importCancel
@@ -4976,7 +5064,8 @@ paths:
summary: cancel ongoing import
tags:
- import
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
operationId: importStatus
parameters:
@@ -5032,7 +5121,8 @@ paths:
summary: get import status
tags:
- import
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: importStart
parameters:
@@ -5099,7 +5189,8 @@ paths:
tags:
- import
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/objects/stage_allowed:
get:
operationId: uploadObjectPreflight
@@ -5159,7 +5250,8 @@ paths:
description: Internal Server Error
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/objects:
delete:
operationId: deleteObject
@@ -5226,7 +5318,8 @@ paths:
summary: delete object. Missing objects will not return a NotFound error.
tags:
- objects
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
operationId: uploadObject
parameters:
@@ -5338,7 +5431,8 @@ paths:
- objects
x-validation-exclude-body: true
x-content-type: multipart/form-data
- x-accepts: application/json
+ x-accepts:
+ - application/json
put:
deprecated: true
operationId: stageObject
@@ -5414,7 +5508,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/objects/delete:
post:
operationId: deleteObjects
@@ -5484,7 +5579,8 @@ paths:
tags:
- objects
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branches/{branch}/objects/copy:
post:
operationId: copyObject
@@ -5561,7 +5657,8 @@ paths:
tags:
- objects
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{ref}/objects/stat:
get:
operationId: statObject
@@ -5642,7 +5739,8 @@ paths:
summary: get object metadata
tags:
- objects
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{ref}/objects/underlyingProperties:
get:
operationId: getUnderlyingProperties
@@ -5700,7 +5798,8 @@ paths:
summary: get object properties on underlying storage
tags:
- objects
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{ref}/objects/ls:
get:
operationId: listObjects
@@ -5800,7 +5899,8 @@ paths:
summary: list objects under a given prefix
tags:
- objects
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/refs/{branch}/symlink:
post:
operationId: createSymlinkFile
@@ -5857,7 +5957,8 @@ paths:
summary: creates symlink files corresponding to the given directory
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/actions/runs:
get:
operationId: listRepositoryRuns
@@ -5932,7 +6033,8 @@ paths:
summary: list runs
tags:
- actions
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/actions/runs/{run_id}:
get:
operationId: getRun
@@ -5981,7 +6083,8 @@ paths:
summary: get a run
tags:
- actions
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/actions/runs/{run_id}/hooks:
get:
operationId: listRunHooks
@@ -6049,7 +6152,8 @@ paths:
summary: list run hooks
tags:
- actions
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/actions/runs/{run_id}/hooks/{hook_run_id}/output:
get:
operationId: getRunHookOutput
@@ -6106,7 +6210,9 @@ paths:
summary: get run hook output
tags:
- actions
- x-accepts: application/json
+ x-accepts:
+ - application/json
+ - application/octet-stream
/repositories/{repository}/metadata/object/{type}/{object_id}:
get:
operationId: getMetadataObject
@@ -6188,7 +6294,9 @@ paths:
summary: return a lakeFS metadata object by ID
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
+ - application/octet-stream
/repositories/{repository}/metadata/meta_range/{meta_range}:
get:
operationId: getMetaRange
@@ -6244,7 +6352,8 @@ paths:
summary: return URI to a meta-range file
tags:
- metadata
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/metadata/range/{range}:
get:
operationId: getRange
@@ -6300,7 +6409,8 @@ paths:
summary: return URI to a range file
tags:
- metadata
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/gc/rules/set_allowed:
get:
operationId: setGarbageCollectionRulesPreflight
@@ -6338,7 +6448,8 @@ paths:
description: Internal Server Error
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/gc/rules:
delete:
deprecated: true
@@ -6376,7 +6487,8 @@ paths:
description: Internal Server Error
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
deprecated: true
operationId: internalGetGarbageCollectionRules
@@ -6417,7 +6529,8 @@ paths:
description: Internal Server Error
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
deprecated: true
operationId: internalSetGarbageCollectionRules
@@ -6461,7 +6574,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/gc/prepare_commits:
post:
operationId: prepareGarbageCollectionCommits
@@ -6509,7 +6623,8 @@ paths:
summary: save lists of active commits for garbage collection
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/gc/prepare_uncommited:
post:
operationId: prepareGarbageCollectionUncommitted
@@ -6569,7 +6684,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branch_protection/set_allowed:
get:
operationId: createBranchProtectionRulePreflight
@@ -6613,7 +6729,8 @@ paths:
description: Internal Server Error
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/repositories/{repository}/branch_protection:
delete:
deprecated: true
@@ -6658,7 +6775,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
get:
deprecated: true
operationId: internalGetBranchProtectionRules
@@ -6702,7 +6820,8 @@ paths:
summary: get branch protection rules
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
post:
deprecated: true
operationId: internalCreateBranchProtectionRule
@@ -6746,7 +6865,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/healthcheck:
get:
description: check that the API server is up and running
@@ -6757,7 +6877,8 @@ paths:
security: []
tags:
- healthCheck
- x-accepts: application/json
+ x-accepts:
+ - application/json
/config:
get:
description: retrieve lakeFS configuration
@@ -6777,7 +6898,8 @@ paths:
description: Unauthorized
tags:
- config
- x-accepts: application/json
+ x-accepts:
+ - application/json
/config/version:
get:
deprecated: true
@@ -6798,7 +6920,8 @@ paths:
description: Unauthorized
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/config/storage:
get:
deprecated: true
@@ -6819,7 +6942,8 @@ paths:
description: Unauthorized
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/config/garbage-collection:
get:
description: get information of gc settings
@@ -6839,7 +6963,8 @@ paths:
description: Unauthorized
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
/statistics:
post:
operationId: postStatsEvents
@@ -6876,7 +7001,8 @@ paths:
tags:
- internal
x-content-type: application/json
- x-accepts: application/json
+ x-accepts:
+ - application/json
/usage-report/summary:
get:
operationId: getUsageReportSummary
@@ -6919,7 +7045,9 @@ paths:
summary: get usage report summary
tags:
- internal
- x-accepts: application/json
+ x-accepts:
+ - application/json
+ - application/text
components:
parameters:
PaginationPrefix:
@@ -7983,6 +8111,9 @@ components:
- errors
type: object
ErrorNoACL:
+ example:
+ no_acl: true
+ message: message
properties:
message:
description: short message explaining the error
@@ -8724,7 +8855,7 @@ components:
example:
physical_address: physical_address
presigned_url: presigned_url
- presigned_url_expiry: 0
+ presigned_url_expiry: 5
properties:
physical_address:
type: string
@@ -8756,7 +8887,7 @@ components:
staging:
physical_address: physical_address
presigned_url: presigned_url
- presigned_url_expiry: 0
+ presigned_url_expiry: 5
properties:
staging:
$ref: '#/components/schemas/StagingLocation'
diff --git a/clients/java/build.gradle b/clients/java/build.gradle
index 68cacdbaee8..0fc8fc315a8 100644
--- a/clients/java/build.gradle
+++ b/clients/java/build.gradle
@@ -62,9 +62,9 @@ if(hasProperty('target') && target == 'android') {
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
task.description = "Create jar artifact for ${variant.name}"
task.dependsOn variant.javaCompile
- task.from variant.javaCompile.destinationDir
- task.destinationDir = project.file("${project.buildDir}/outputs/jar")
- task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+ task.from variant.javaCompile.destinationDirectory
+ task.destinationDirectory = project.file("${project.buildDir}/outputs/jar")
+ task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar"
artifacts.add('archives', task)
}
}
@@ -108,18 +108,17 @@ ext {
dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
- implementation 'com.squareup.okhttp3:okhttp:4.10.0'
- implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+ implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+ implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
implementation 'com.google.code.gson:gson:2.9.1'
- implementation 'io.gsonfire:gson-fire:1.8.5'
- implementation 'javax.ws.rs:jsr311-api:1.1.1'
- implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+ implementation 'io.gsonfire:gson-fire:1.9.0'
+ implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}
javadoc {
diff --git a/clients/java/build.sbt b/clients/java/build.sbt
index fe19e48efdb..a1cc7f543d9 100644
--- a/clients/java/build.sbt
+++ b/clients/java/build.sbt
@@ -10,18 +10,17 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.6.5",
- "com.squareup.okhttp3" % "okhttp" % "4.10.0",
- "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0",
+ "com.squareup.okhttp3" % "okhttp" % "4.12.0",
+ "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
"com.google.code.gson" % "gson" % "2.9.1",
"org.apache.commons" % "commons-lang3" % "3.12.0",
- "javax.ws.rs" % "jsr311-api" % "1.1.1",
- "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+ "jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.6",
- "io.gsonfire" % "gson-fire" % "1.8.5" % "compile",
+ "io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
- "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+ "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
diff --git a/clients/java/gradle/wrapper/gradle-wrapper.jar b/clients/java/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae..e6441136f3d 100644
Binary files a/clients/java/gradle/wrapper/gradle-wrapper.jar and b/clients/java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/clients/java/gradle/wrapper/gradle-wrapper.properties b/clients/java/gradle/wrapper/gradle-wrapper.properties
index ffed3a254e9..b82aa23a4f0 100644
--- a/clients/java/gradle/wrapper/gradle-wrapper.properties
+++ b/clients/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/clients/java/gradlew b/clients/java/gradlew
index 005bcde0428..9d0ce634cb1 100644
--- a/clients/java/gradlew
+++ b/clients/java/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -69,37 +69,35 @@ app_path=$0
# Need this for daisy-chained symlinks.
while
- APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
- [ -h "$app_path" ]
+APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+[ -h "$app_path" ]
do
- ls=$( ls -ld "$app_path" )
- link=${ls#*' -> '}
- case $link in #(
- /*) app_path=$link ;; #(
- *) app_path=$APP_HOME$link ;;
- esac
+ls=$( ls -ld "$app_path" )
+link=${ls#*' -> '}
+case $link in #(
+/*) app_path=$link ;; #(
+*) app_path=$APP_HOME$link ;;
+esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
- echo "$*"
+echo "$*"
} >&2
die () {
- echo
- echo "$*"
- echo
- exit 1
+echo
+echo "$*"
+echo
+exit 1
} >&2
# OS specific support (must be 'true' or 'false').
@@ -108,10 +106,10 @@ msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
- CYGWIN* ) cygwin=true ;; #(
- Darwin* ) darwin=true ;; #(
- MSYS* | MINGW* ) msys=true ;; #(
- NONSTOP* ) nonstop=true ;;
+CYGWIN* ) cygwin=true ;; #(
+Darwin* ) darwin=true ;; #(
+MSYS* | MINGW* ) msys=true ;; #(
+NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -119,39 +117,46 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD=$JAVA_HOME/jre/sh/java
- else
- JAVACMD=$JAVA_HOME/bin/java
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+# IBM's JDK on AIX uses strange locations for the executables
+JAVACMD=$JAVA_HOME/jre/sh/java
+else
+JAVACMD=$JAVA_HOME/bin/java
+fi
+if [ ! -x "$JAVACMD" ] ; then
+die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
- fi
+fi
else
- JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+JAVACMD=java
+if ! command -v java >/dev/null 2>&1
+then
+die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
+fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
- case $MAX_FD in #(
- max*)
- MAX_FD=$( ulimit -H -n ) ||
- warn "Could not query maximum file descriptor limit"
- esac
- case $MAX_FD in #(
- '' | soft) :;; #(
- *)
- ulimit -n "$MAX_FD" ||
- warn "Could not set maximum file descriptor limit to $MAX_FD"
- esac
+case $MAX_FD in #(
+max*)
+# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+# shellcheck disable=SC2039,SC3045
+MAX_FD=$( ulimit -H -n ) ||
+warn "Could not query maximum file descriptor limit"
+esac
+case $MAX_FD in #(
+'' | soft) :;; #(
+*)
+# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+# shellcheck disable=SC2039,SC3045
+ulimit -n "$MAX_FD" ||
+warn "Could not set maximum file descriptor limit to $MAX_FD"
+esac
fi
# Collect all arguments for the java command, stacking in reverse order:
@@ -164,46 +169,56 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
- APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
- JAVACMD=$( cygpath --unix "$JAVACMD" )
-
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- for arg do
- if
- case $arg in #(
- -*) false ;; # don't mess with options #(
- /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
- [ -e "$t" ] ;; #(
- *) false ;;
- esac
- then
- arg=$( cygpath --path --ignore --mixed "$arg" )
- fi
- # Roll the args list around exactly as many times as the number of
- # args, so each arg winds up back in the position where it started, but
- # possibly modified.
- #
- # NB: a `for` loop captures its iteration list before it begins, so
- # changing the positional parameters here affects neither the number of
- # iterations, nor the values presented in `arg`.
- shift # remove old arg
- set -- "$@" "$arg" # push replacement arg
- done
+APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+# Now convert the arguments - kludge to limit ourselves to /bin/sh
+for arg do
+if
+case $arg in #(
+-*) false ;; # don't mess with options #(
+/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+[ -e "$t" ] ;; #(
+*) false ;;
+esac
+then
+arg=$( cygpath --path --ignore --mixed "$arg" )
+fi
+# Roll the args list around exactly as many times as the number of
+# args, so each arg winds up back in the position where it started, but
+# possibly modified.
+#
+# NB: a `for` loop captures its iteration list before it begins, so
+# changing the positional parameters here affects neither the number of
+# iterations, nor the values presented in `arg`.
+shift # remove old arg
+set -- "$@" "$arg" # push replacement arg
+done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
- "-Dorg.gradle.appname=$APP_BASE_NAME" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
- "$@"
+"-Dorg.gradle.appname=$APP_BASE_NAME" \
+-classpath "$CLASSPATH" \
+org.gradle.wrapper.GradleWrapperMain \
+"$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+die "xargs is not available"
+fi
# Use "xargs" to parse quoted args.
#
@@ -225,10 +240,10 @@ set -- \
#
eval "set -- $(
- printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
- xargs -n1 |
- sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
- tr '\n' ' '
- )" '"$@"'
+printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+xargs -n1 |
+sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+tr '\n' ' '
+)" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/clients/java/gradlew.bat b/clients/java/gradlew.bat
index 6a68175eb70..25da30dbdee 100644
--- a/clients/java/gradlew.bat
+++ b/clients/java/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -33,20 +34,20 @@ set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/clients/java/pom.xml b/clients/java/pom.xml
index 6dfe19b304c..46c46aeadb9 100644
--- a/clients/java/pom.xml
+++ b/clients/java/pom.xml
@@ -55,7 +55,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.1.0
+ 3.4.1
enforce-maven
@@ -77,12 +77,12 @@
maven-surefire-plugin
2.22.2
-
+
loggerPath
conf/log4j.properties
-
+
-Xms512m -Xmx1500m
methods
10
@@ -98,7 +98,7 @@
maven-dependency-plugin
- 3.3.0
+ 3.6.1
package
@@ -129,7 +129,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.5.0
add_sources
@@ -160,7 +160,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.4.1
+ 3.6.3
attach-javadocs
@@ -183,7 +183,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.0
attach-sources
@@ -246,7 +246,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 3.0.1
+ 3.2.1
sign-artifacts
@@ -305,16 +305,10 @@
jackson-databind-nullable
${jackson-databind-nullable-version}
-
- javax.ws.rs
- jsr311-api
- ${jsr311-api-version}
-
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api-version}
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+ ${jakarta.ws.rs-api-version}
@@ -329,29 +323,22 @@
${junit-platform-runner.version}
test
-
- org.mockito
- mockito-core
- ${mockito-core-version}
- test
-
1.8
${java.version}
${java.version}
- 1.8.5
- 4.10.0
- 2.9.1
- 3.12.0
+ 1.9.0
+ 4.12.0
+ 2.10.1
+ 3.14.0
0.2.6
1.3.5
- 5.9.1
- 1.9.1
- 3.12.4
- 2.1.1
+ 5.10.3
+ 1.10.0
+ 2.1.6
1.1.1
UTF-8
- 2.27.2
+ 2.43.0
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/ApiClient.java b/clients/java/src/main/java/io/lakefs/clients/sdk/ApiClient.java
index 38fd1cbfcd2..4d16290d0ac 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/ApiClient.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/ApiClient.java
@@ -47,6 +47,7 @@
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -392,14 +393,23 @@ public Authentication getAuthentication(String authName) {
return authentications.get(authName);
}
- /**
- * Helper method to set access token for the first Bearer authentication.
- * @param bearerToken Bearer token
- */
+ /**
+ * Helper method to set access token for the first Bearer authentication.
+ * @param bearerToken Bearer token
+ */
public void setBearerToken(String bearerToken) {
+ setBearerToken(() -> bearerToken);
+ }
+
+ /**
+ * Helper method to set the supplier of access tokens for Bearer authentication.
+ *
+ * @param tokenSupplier The supplier of bearer tokens
+ */
+ public void setBearerToken(Supplier tokenSupplier) {
for (Authentication auth : authentications.values()) {
if (auth instanceof HttpBearerAuth) {
- ((HttpBearerAuth) auth).setBearerToken(bearerToken);
+ ((HttpBearerAuth) auth).setBearerToken(tokenSupplier);
return;
}
}
@@ -487,6 +497,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
throw new RuntimeException("No AWS4 authentication configured!");
}
+ /**
+ * Helper method to set credentials for AWSV4 Signature
+ *
+ * @param accessKey Access Key
+ * @param secretKey Secret Key
+ * @param sessionToken Session Token
+ * @param region Region
+ * @param service Service to access to
+ */
+ public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+ throw new RuntimeException("No AWS4 authentication configured!");
+ }
+
/**
* Set the User-Agent header's value (by adding to the default header map).
*
@@ -742,6 +765,30 @@ public List parameterToPairs(String collectionFormat, String name, Collect
return params;
}
+ /**
+ * Formats the specified free-form query parameters to a list of {@code Pair} objects.
+ *
+ * @param value The free-form query parameters.
+ * @return A list of {@code Pair} objects.
+ */
+ public List freeFormParameterToPairs(Object value) {
+ List params = new ArrayList<>();
+
+ // preconditions
+ if (value == null || !(value instanceof Map )) {
+ return params;
+ }
+
+ final Map valuesMap = (Map) value;
+
+ for (Map.Entry entry : valuesMap.entrySet()) {
+ params.add(new Pair(entry.getKey(), parameterToString(entry.getValue())));
+ }
+
+ return params;
+ }
+
+
/**
* Formats the specified collection path parameter to a string value.
*
@@ -1180,10 +1227,6 @@ public Call buildCall(String baseUrl, String path, String method, List que
* @throws io.lakefs.clients.sdk.ApiException If fail to serialize the request body object
*/
public Request buildRequest(String baseUrl, String path, String method, List queryParams, List collectionQueryParams, Object body, Map headerParams, Map cookieParams, Map formParams, String[] authNames, ApiCallback callback) throws ApiException {
- // aggregate queryParams (non-collection) and collectionQueryParams into allQueryParams
- List allQueryParams = new ArrayList(queryParams);
- allQueryParams.addAll(collectionQueryParams);
-
final String url = buildUrl(baseUrl, path, queryParams, collectionQueryParams);
// prepare HTTP request body
@@ -1211,10 +1254,12 @@ public Request buildRequest(String baseUrl, String path, String method, List updatedQueryParams = new ArrayList<>(queryParams);
+
// update parameters with authentication settings
- updateParamsForAuth(authNames, allQueryParams, headerParams, cookieParams, requestBodyToString(reqBody), method, URI.create(url));
+ updateParamsForAuth(authNames, updatedQueryParams, headerParams, cookieParams, requestBodyToString(reqBody), method, URI.create(url));
- final Request.Builder reqBuilder = new Request.Builder().url(url);
+ final Request.Builder reqBuilder = new Request.Builder().url(buildUrl(baseUrl, path, updatedQueryParams, collectionQueryParams));
processHeaderParams(headerParams, reqBuilder);
processCookieParams(cookieParams, reqBuilder);
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/ApiException.java b/clients/java/src/main/java/io/lakefs/clients/sdk/ApiException.java
index 75154e65803..66a603f4f20 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/ApiException.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/ApiException.java
@@ -21,8 +21,10 @@
* ApiException class.
*/
@SuppressWarnings("serial")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ApiException extends Exception {
+ private static final long serialVersionUID = 1L;
+
private int code = 0;
private Map> responseHeaders = null;
private String responseBody = null;
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/Configuration.java b/clients/java/src/main/java/io/lakefs/clients/sdk/Configuration.java
index d84c029d5fe..6746332ad07 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/Configuration.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/Configuration.java
@@ -13,7 +13,7 @@
package io.lakefs.clients.sdk;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Configuration {
public static final String VERSION = "0.1.0-SNAPSHOT";
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/JSON.java b/clients/java/src/main/java/io/lakefs/clients/sdk/JSON.java
index 99e478a97cf..44dda5cf82b 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/JSON.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/JSON.java
@@ -86,7 +86,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
return clazz;
}
- {
+ static {
GsonBuilder gsonBuilder = createGson();
gsonBuilder.registerTypeAdapter(Date.class, dateTypeAdapter);
gsonBuilder.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter);
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/Pair.java b/clients/java/src/main/java/io/lakefs/clients/sdk/Pair.java
index 1f33070b256..73bb46383cb 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/Pair.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/Pair.java
@@ -13,7 +13,7 @@
package io.lakefs.clients.sdk;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Pair {
private String name = "";
private String value = "";
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/ServerConfiguration.java b/clients/java/src/main/java/io/lakefs/clients/sdk/ServerConfiguration.java
index 946b24bf46d..e52345447ef 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/ServerConfiguration.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/ServerConfiguration.java
@@ -1,3 +1,16 @@
+/*
+ * lakeFS API
+ * lakeFS HTTP API
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
package io.lakefs.clients.sdk;
import java.util.Map;
@@ -5,6 +18,7 @@
/**
* Representing a Server configuration.
*/
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ServerConfiguration {
public String URL;
public String description;
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/ServerVariable.java b/clients/java/src/main/java/io/lakefs/clients/sdk/ServerVariable.java
index d873f9fdf87..5ed0e84a900 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/ServerVariable.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/ServerVariable.java
@@ -1,3 +1,16 @@
+/*
+ * lakeFS API
+ * lakeFS HTTP API
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
package io.lakefs.clients.sdk;
import java.util.HashSet;
@@ -5,6 +18,7 @@
/**
* Representing a Server Variable for server URL template substitution.
*/
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ServerVariable {
public String description;
public String defaultValue;
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/StringUtil.java b/clients/java/src/main/java/io/lakefs/clients/sdk/StringUtil.java
index 07be3c7cb0e..cf5f6aefe27 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/StringUtil.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/StringUtil.java
@@ -16,7 +16,7 @@
import java.util.Collection;
import java.util.Iterator;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/auth/ApiKeyAuth.java b/clients/java/src/main/java/io/lakefs/clients/sdk/auth/ApiKeyAuth.java
index fc4a37a1e97..ec7f6148b78 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/auth/ApiKeyAuth.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/auth/ApiKeyAuth.java
@@ -20,7 +20,7 @@
import java.util.Map;
import java.util.List;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ApiKeyAuth implements Authentication {
private final String location;
private final String paramName;
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBasicAuth.java b/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBasicAuth.java
index b524448523e..d931aa33042 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBasicAuth.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBasicAuth.java
@@ -22,8 +22,6 @@
import java.util.Map;
import java.util.List;
-import java.io.UnsupportedEncodingException;
-
public class HttpBasicAuth implements Authentication {
private String username;
private String password;
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBearerAuth.java b/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBearerAuth.java
index e41ac3189ac..ae2cf0f00e7 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBearerAuth.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/auth/HttpBearerAuth.java
@@ -17,13 +17,15 @@
import io.lakefs.clients.sdk.Pair;
import java.net.URI;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class HttpBearerAuth implements Authentication {
private final String scheme;
- private String bearerToken;
+ private Supplier tokenSupplier;
public HttpBearerAuth(String scheme) {
this.scheme = scheme;
@@ -35,7 +37,7 @@ public HttpBearerAuth(String scheme) {
* @return The bearer token
*/
public String getBearerToken() {
- return bearerToken;
+ return tokenSupplier.get();
}
/**
@@ -44,12 +46,22 @@ public String getBearerToken() {
* @param bearerToken The bearer token to send in the Authorization header
*/
public void setBearerToken(String bearerToken) {
- this.bearerToken = bearerToken;
+ this.tokenSupplier = () -> bearerToken;
+ }
+
+ /**
+ * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header.
+ *
+ * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header
+ */
+ public void setBearerToken(Supplier tokenSupplier) {
+ this.tokenSupplier = tokenSupplier;
}
@Override
public void applyToParams(List queryParams, Map headerParams, Map cookieParams,
String payload, String method, URI uri) throws ApiException {
+ String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null);
if (bearerToken == null) {
return;
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ACL.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ACL.java
index b114a6bd981..9046a4b3af4 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ACL.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ACL.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* ACL
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ACL {
public static final String SERIALIZED_NAME_PERMISSION = "permission";
@SerializedName(SERIALIZED_NAME_PERMISSION)
@@ -60,21 +58,19 @@ public ACL() {
}
public ACL permission(String permission) {
-
this.permission = permission;
return this;
}
- /**
+ /**
* Permission level to give this ACL. \"Read\", \"Write\", \"Super\" and \"Admin\" are all supported.
* @return permission
- **/
+ */
@javax.annotation.Nonnull
public String getPermission() {
return permission;
}
-
public void setPermission(String permission) {
this.permission = permission;
}
@@ -178,12 +174,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("permission");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to ACL
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to ACL
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!ACL.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -231,7 +227,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -270,22 +271,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of ACL given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of ACL
- * @throws IOException if the JSON string is invalid with respect to ACL
- */
+ /**
+ * Create an instance of ACL given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of ACL
+ * @throws IOException if the JSON string is invalid with respect to ACL
+ */
public static ACL fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, ACL.class);
}
- /**
- * Convert an instance of ACL to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of ACL to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbortPresignMultipartUpload.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbortPresignMultipartUpload.java
index 51d0837e791..2b7e15715c0 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbortPresignMultipartUpload.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbortPresignMultipartUpload.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* AbortPresignMultipartUpload
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class AbortPresignMultipartUpload {
public static final String SERIALIZED_NAME_PHYSICAL_ADDRESS = "physical_address";
@SerializedName(SERIALIZED_NAME_PHYSICAL_ADDRESS)
@@ -60,21 +58,19 @@ public AbortPresignMultipartUpload() {
}
public AbortPresignMultipartUpload physicalAddress(String physicalAddress) {
-
this.physicalAddress = physicalAddress;
return this;
}
- /**
+ /**
* Get physicalAddress
* @return physicalAddress
- **/
+ */
@javax.annotation.Nonnull
public String getPhysicalAddress() {
return physicalAddress;
}
-
public void setPhysicalAddress(String physicalAddress) {
this.physicalAddress = physicalAddress;
}
@@ -178,12 +174,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("physical_address");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to AbortPresignMultipartUpload
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to AbortPresignMultipartUpload
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!AbortPresignMultipartUpload.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -231,7 +227,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -270,22 +271,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of AbortPresignMultipartUpload given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of AbortPresignMultipartUpload
- * @throws IOException if the JSON string is invalid with respect to AbortPresignMultipartUpload
- */
+ /**
+ * Create an instance of AbortPresignMultipartUpload given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of AbortPresignMultipartUpload
+ * @throws IOException if the JSON string is invalid with respect to AbortPresignMultipartUpload
+ */
public static AbortPresignMultipartUpload fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, AbortPresignMultipartUpload.class);
}
- /**
- * Convert an instance of AbortPresignMultipartUpload to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of AbortPresignMultipartUpload to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbstractOpenApiSchema.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbstractOpenApiSchema.java
index c72d060a2e2..a17ac20ef59 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbstractOpenApiSchema.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AbstractOpenApiSchema.java
@@ -18,12 +18,10 @@
import java.lang.reflect.Type;
import java.util.Map;
-//import com.fasterxml.jackson.annotation.JsonValue;
-
/**
* Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public abstract class AbstractOpenApiSchema {
// store the actual instance of the schema/object
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AccessKeyCredentials.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AccessKeyCredentials.java
index 40e757a7205..96ca0515b90 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AccessKeyCredentials.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AccessKeyCredentials.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* AccessKeyCredentials
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class AccessKeyCredentials {
public static final String SERIALIZED_NAME_ACCESS_KEY_ID = "access_key_id";
@SerializedName(SERIALIZED_NAME_ACCESS_KEY_ID)
@@ -64,42 +62,38 @@ public AccessKeyCredentials() {
}
public AccessKeyCredentials accessKeyId(String accessKeyId) {
-
this.accessKeyId = accessKeyId;
return this;
}
- /**
+ /**
* access key ID to set for user for use in integration testing.
* @return accessKeyId
- **/
+ */
@javax.annotation.Nonnull
public String getAccessKeyId() {
return accessKeyId;
}
-
public void setAccessKeyId(String accessKeyId) {
this.accessKeyId = accessKeyId;
}
public AccessKeyCredentials secretAccessKey(String secretAccessKey) {
-
this.secretAccessKey = secretAccessKey;
return this;
}
- /**
+ /**
* secret access key to set for user for use in integration testing.
* @return secretAccessKey
- **/
+ */
@javax.annotation.Nonnull
public String getSecretAccessKey() {
return secretAccessKey;
}
-
public void setSecretAccessKey(String secretAccessKey) {
this.secretAccessKey = secretAccessKey;
}
@@ -207,12 +201,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("secret_access_key");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to AccessKeyCredentials
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to AccessKeyCredentials
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!AccessKeyCredentials.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -263,7 +257,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -302,22 +301,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of AccessKeyCredentials given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of AccessKeyCredentials
- * @throws IOException if the JSON string is invalid with respect to AccessKeyCredentials
- */
+ /**
+ * Create an instance of AccessKeyCredentials given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of AccessKeyCredentials
+ * @throws IOException if the JSON string is invalid with respect to AccessKeyCredentials
+ */
public static AccessKeyCredentials fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, AccessKeyCredentials.class);
}
- /**
- * Convert an instance of AccessKeyCredentials to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of AccessKeyCredentials to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRun.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRun.java
index 6328801766a..d1a25e7c147 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRun.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRun.java
@@ -38,12 +38,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -51,7 +49,7 @@
/**
* ActionRun
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ActionRun {
public static final String SERIALIZED_NAME_RUN_ID = "run_id";
@SerializedName(SERIALIZED_NAME_RUN_ID)
@@ -118,6 +116,11 @@ public StatusEnum read(final JsonReader jsonReader) throws IOException {
return StatusEnum.fromValue(value);
}
}
+
+ public static void validateJsonElement(JsonElement jsonElement) throws IOException {
+ String value = jsonElement.getAsString();
+ StatusEnum.fromValue(value);
+ }
}
public static final String SERIALIZED_NAME_STATUS = "status";
@@ -132,147 +135,133 @@ public ActionRun() {
}
public ActionRun runId(String runId) {
-
this.runId = runId;
return this;
}
- /**
+ /**
* Get runId
* @return runId
- **/
+ */
@javax.annotation.Nonnull
public String getRunId() {
return runId;
}
-
public void setRunId(String runId) {
this.runId = runId;
}
public ActionRun branch(String branch) {
-
this.branch = branch;
return this;
}
- /**
+ /**
* Get branch
* @return branch
- **/
+ */
@javax.annotation.Nonnull
public String getBranch() {
return branch;
}
-
public void setBranch(String branch) {
this.branch = branch;
}
public ActionRun startTime(OffsetDateTime startTime) {
-
this.startTime = startTime;
return this;
}
- /**
+ /**
* Get startTime
* @return startTime
- **/
+ */
@javax.annotation.Nonnull
public OffsetDateTime getStartTime() {
return startTime;
}
-
public void setStartTime(OffsetDateTime startTime) {
this.startTime = startTime;
}
public ActionRun endTime(OffsetDateTime endTime) {
-
this.endTime = endTime;
return this;
}
- /**
+ /**
* Get endTime
* @return endTime
- **/
+ */
@javax.annotation.Nullable
public OffsetDateTime getEndTime() {
return endTime;
}
-
public void setEndTime(OffsetDateTime endTime) {
this.endTime = endTime;
}
public ActionRun eventType(String eventType) {
-
this.eventType = eventType;
return this;
}
- /**
+ /**
* Get eventType
* @return eventType
- **/
+ */
@javax.annotation.Nonnull
public String getEventType() {
return eventType;
}
-
public void setEventType(String eventType) {
this.eventType = eventType;
}
public ActionRun status(StatusEnum status) {
-
this.status = status;
return this;
}
- /**
+ /**
* Get status
* @return status
- **/
+ */
@javax.annotation.Nonnull
public StatusEnum getStatus() {
return status;
}
-
public void setStatus(StatusEnum status) {
this.status = status;
}
public ActionRun commitId(String commitId) {
-
this.commitId = commitId;
return this;
}
- /**
+ /**
* Get commitId
* @return commitId
- **/
+ */
@javax.annotation.Nonnull
public String getCommitId() {
return commitId;
}
-
public void setCommitId(String commitId) {
this.commitId = commitId;
}
@@ -399,12 +388,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("commit_id");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to ActionRun
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to ActionRun
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!ActionRun.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -431,6 +420,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
if (!jsonObj.get("status").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `status` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status").toString()));
}
+ // validate the required field `status`
+ StatusEnum.validateJsonElement(jsonObj.get("status"));
if (!jsonObj.get("commit_id").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `commit_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("commit_id").toString()));
}
@@ -464,7 +455,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -503,22 +499,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of ActionRun given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of ActionRun
- * @throws IOException if the JSON string is invalid with respect to ActionRun
- */
+ /**
+ * Create an instance of ActionRun given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of ActionRun
+ * @throws IOException if the JSON string is invalid with respect to ActionRun
+ */
public static ActionRun fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, ActionRun.class);
}
- /**
- * Convert an instance of ActionRun to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of ActionRun to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRunList.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRunList.java
index 28d11cda964..29475fe674c 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRunList.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ActionRunList.java
@@ -41,12 +41,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -54,7 +52,7 @@
/**
* ActionRunList
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ActionRunList {
public static final String SERIALIZED_NAME_PAGINATION = "pagination";
@SerializedName(SERIALIZED_NAME_PAGINATION)
@@ -68,28 +66,25 @@ public ActionRunList() {
}
public ActionRunList pagination(Pagination pagination) {
-
this.pagination = pagination;
return this;
}
- /**
+ /**
* Get pagination
* @return pagination
- **/
+ */
@javax.annotation.Nonnull
public Pagination getPagination() {
return pagination;
}
-
public void setPagination(Pagination pagination) {
this.pagination = pagination;
}
public ActionRunList results(List results) {
-
this.results = results;
return this;
}
@@ -102,16 +97,15 @@ public ActionRunList addResultsItem(ActionRun resultsItem) {
return this;
}
- /**
+ /**
* Get results
* @return results
- **/
+ */
@javax.annotation.Nonnull
public List getResults() {
return results;
}
-
public void setResults(List results) {
this.results = results;
}
@@ -219,12 +213,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("results");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to ActionRunList
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to ActionRunList
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!ActionRunList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -281,7 +275,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -320,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of ActionRunList given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of ActionRunList
- * @throws IOException if the JSON string is invalid with respect to ActionRunList
- */
+ /**
+ * Create an instance of ActionRunList given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of ActionRunList
+ * @throws IOException if the JSON string is invalid with respect to ActionRunList
+ */
public static ActionRunList fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, ActionRunList.class);
}
- /**
- * Convert an instance of ActionRunList to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of ActionRunList to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthCapabilities.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthCapabilities.java
index 72ca5c74681..f75e5c558ab 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthCapabilities.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthCapabilities.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* AuthCapabilities
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class AuthCapabilities {
public static final String SERIALIZED_NAME_INVITE_USER = "invite_user";
@SerializedName(SERIALIZED_NAME_INVITE_USER)
@@ -64,42 +62,38 @@ public AuthCapabilities() {
}
public AuthCapabilities inviteUser(Boolean inviteUser) {
-
this.inviteUser = inviteUser;
return this;
}
- /**
+ /**
* Get inviteUser
* @return inviteUser
- **/
+ */
@javax.annotation.Nullable
public Boolean getInviteUser() {
return inviteUser;
}
-
public void setInviteUser(Boolean inviteUser) {
this.inviteUser = inviteUser;
}
public AuthCapabilities forgotPassword(Boolean forgotPassword) {
-
this.forgotPassword = forgotPassword;
return this;
}
- /**
+ /**
* Get forgotPassword
* @return forgotPassword
- **/
+ */
@javax.annotation.Nullable
public Boolean getForgotPassword() {
return forgotPassword;
}
-
public void setForgotPassword(Boolean forgotPassword) {
this.forgotPassword = forgotPassword;
}
@@ -205,12 +199,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields = new HashSet();
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to AuthCapabilities
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to AuthCapabilities
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!AuthCapabilities.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -248,7 +242,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -287,22 +286,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of AuthCapabilities given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of AuthCapabilities
- * @throws IOException if the JSON string is invalid with respect to AuthCapabilities
- */
+ /**
+ * Create an instance of AuthCapabilities given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of AuthCapabilities
+ * @throws IOException if the JSON string is invalid with respect to AuthCapabilities
+ */
public static AuthCapabilities fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, AuthCapabilities.class);
}
- /**
- * Convert an instance of AuthCapabilities to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of AuthCapabilities to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthenticationToken.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthenticationToken.java
index 47c4d874a19..9621c282997 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthenticationToken.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/AuthenticationToken.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* AuthenticationToken
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class AuthenticationToken {
public static final String SERIALIZED_NAME_TOKEN = "token";
@SerializedName(SERIALIZED_NAME_TOKEN)
@@ -64,42 +62,38 @@ public AuthenticationToken() {
}
public AuthenticationToken token(String token) {
-
this.token = token;
return this;
}
- /**
+ /**
* a JWT token that could be used to authenticate requests
* @return token
- **/
+ */
@javax.annotation.Nonnull
public String getToken() {
return token;
}
-
public void setToken(String token) {
this.token = token;
}
public AuthenticationToken tokenExpiration(Long tokenExpiration) {
-
this.tokenExpiration = tokenExpiration;
return this;
}
- /**
+ /**
* Unix Epoch in seconds
* @return tokenExpiration
- **/
+ */
@javax.annotation.Nullable
public Long getTokenExpiration() {
return tokenExpiration;
}
-
public void setTokenExpiration(Long tokenExpiration) {
this.tokenExpiration = tokenExpiration;
}
@@ -206,12 +200,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("token");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to AuthenticationToken
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to AuthenticationToken
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!AuthenticationToken.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -259,7 +253,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -298,22 +297,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of AuthenticationToken given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of AuthenticationToken
- * @throws IOException if the JSON string is invalid with respect to AuthenticationToken
- */
+ /**
+ * Create an instance of AuthenticationToken given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of AuthenticationToken
+ * @throws IOException if the JSON string is invalid with respect to AuthenticationToken
+ */
public static AuthenticationToken fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, AuthenticationToken.class);
}
- /**
- * Convert an instance of AuthenticationToken to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of AuthenticationToken to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchCreation.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchCreation.java
index 1b80f7fdbac..b6475ed0220 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchCreation.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchCreation.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* BranchCreation
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class BranchCreation {
public static final String SERIALIZED_NAME_NAME = "name";
@SerializedName(SERIALIZED_NAME_NAME)
@@ -68,63 +66,57 @@ public BranchCreation() {
}
public BranchCreation name(String name) {
-
this.name = name;
return this;
}
- /**
+ /**
* Get name
* @return name
- **/
+ */
@javax.annotation.Nonnull
public String getName() {
return name;
}
-
public void setName(String name) {
this.name = name;
}
public BranchCreation source(String source) {
-
this.source = source;
return this;
}
- /**
+ /**
* Get source
* @return source
- **/
+ */
@javax.annotation.Nonnull
public String getSource() {
return source;
}
-
public void setSource(String source) {
this.source = source;
}
public BranchCreation force(Boolean force) {
-
this.force = force;
return this;
}
- /**
+ /**
* Get force
* @return force
- **/
+ */
@javax.annotation.Nullable
public Boolean getForce() {
return force;
}
-
public void setForce(Boolean force) {
this.force = force;
}
@@ -235,12 +227,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("source");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to BranchCreation
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to BranchCreation
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!BranchCreation.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -291,7 +283,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -330,22 +327,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of BranchCreation given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of BranchCreation
- * @throws IOException if the JSON string is invalid with respect to BranchCreation
- */
+ /**
+ * Create an instance of BranchCreation given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of BranchCreation
+ * @throws IOException if the JSON string is invalid with respect to BranchCreation
+ */
public static BranchCreation fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, BranchCreation.class);
}
- /**
- * Convert an instance of BranchCreation to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of BranchCreation to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchProtectionRule.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchProtectionRule.java
index 6d37a6e7c93..78058bff62a 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchProtectionRule.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/BranchProtectionRule.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* BranchProtectionRule
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class BranchProtectionRule {
public static final String SERIALIZED_NAME_PATTERN = "pattern";
@SerializedName(SERIALIZED_NAME_PATTERN)
@@ -60,21 +58,19 @@ public BranchProtectionRule() {
}
public BranchProtectionRule pattern(String pattern) {
-
this.pattern = pattern;
return this;
}
- /**
+ /**
* fnmatch pattern for the branch name, supporting * and ? wildcards
* @return pattern
- **/
+ */
@javax.annotation.Nonnull
public String getPattern() {
return pattern;
}
-
public void setPattern(String pattern) {
this.pattern = pattern;
}
@@ -178,12 +174,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("pattern");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to BranchProtectionRule
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to BranchProtectionRule
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!BranchProtectionRule.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -231,7 +227,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -270,22 +271,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of BranchProtectionRule given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of BranchProtectionRule
- * @throws IOException if the JSON string is invalid with respect to BranchProtectionRule
- */
+ /**
+ * Create an instance of BranchProtectionRule given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of BranchProtectionRule
+ * @throws IOException if the JSON string is invalid with respect to BranchProtectionRule
+ */
public static BranchProtectionRule fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, BranchProtectionRule.class);
}
- /**
- * Convert an instance of BranchProtectionRule to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of BranchProtectionRule to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CherryPickCreation.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CherryPickCreation.java
index 720d406072c..7b64f2257fd 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CherryPickCreation.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CherryPickCreation.java
@@ -38,12 +38,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -51,7 +49,7 @@
/**
* CherryPickCreation
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CherryPickCreation {
public static final String SERIALIZED_NAME_REF = "ref";
@SerializedName(SERIALIZED_NAME_REF)
@@ -73,84 +71,76 @@ public CherryPickCreation() {
}
public CherryPickCreation ref(String ref) {
-
this.ref = ref;
return this;
}
- /**
+ /**
* the commit to cherry-pick, given by a ref
* @return ref
- **/
+ */
@javax.annotation.Nonnull
public String getRef() {
return ref;
}
-
public void setRef(String ref) {
this.ref = ref;
}
public CherryPickCreation parentNumber(Integer parentNumber) {
-
this.parentNumber = parentNumber;
return this;
}
- /**
+ /**
* When cherry-picking a merge commit, the parent number (starting from 1) with which to perform the diff. The default branch is parent 1.
* @return parentNumber
- **/
+ */
@javax.annotation.Nullable
public Integer getParentNumber() {
return parentNumber;
}
-
public void setParentNumber(Integer parentNumber) {
this.parentNumber = parentNumber;
}
public CherryPickCreation commitOverrides(CommitOverrides commitOverrides) {
-
this.commitOverrides = commitOverrides;
return this;
}
- /**
+ /**
* Get commitOverrides
* @return commitOverrides
- **/
+ */
@javax.annotation.Nullable
public CommitOverrides getCommitOverrides() {
return commitOverrides;
}
-
public void setCommitOverrides(CommitOverrides commitOverrides) {
this.commitOverrides = commitOverrides;
}
public CherryPickCreation force(Boolean force) {
-
this.force = force;
return this;
}
- /**
+ /**
* Get force
* @return force
- **/
+ */
@javax.annotation.Nullable
public Boolean getForce() {
return force;
}
-
public void setForce(Boolean force) {
this.force = force;
}
@@ -263,12 +253,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("ref");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CherryPickCreation
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CherryPickCreation
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CherryPickCreation.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -320,7 +310,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -359,22 +354,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CherryPickCreation given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CherryPickCreation
- * @throws IOException if the JSON string is invalid with respect to CherryPickCreation
- */
+ /**
+ * Create an instance of CherryPickCreation given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CherryPickCreation
+ * @throws IOException if the JSON string is invalid with respect to CherryPickCreation
+ */
public static CherryPickCreation fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CherryPickCreation.class);
}
- /**
- * Convert an instance of CherryPickCreation to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CherryPickCreation to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommPrefsInput.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommPrefsInput.java
index 7cc3a6743d2..d3818f0b049 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommPrefsInput.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommPrefsInput.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* CommPrefsInput
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CommPrefsInput {
public static final String SERIALIZED_NAME_EMAIL = "email";
@SerializedName(SERIALIZED_NAME_EMAIL)
@@ -68,63 +66,57 @@ public CommPrefsInput() {
}
public CommPrefsInput email(String email) {
-
this.email = email;
return this;
}
- /**
+ /**
* the provided email
* @return email
- **/
+ */
@javax.annotation.Nullable
public String getEmail() {
return email;
}
-
public void setEmail(String email) {
this.email = email;
}
public CommPrefsInput featureUpdates(Boolean featureUpdates) {
-
this.featureUpdates = featureUpdates;
return this;
}
- /**
+ /**
* user preference to receive feature updates
* @return featureUpdates
- **/
+ */
@javax.annotation.Nonnull
public Boolean getFeatureUpdates() {
return featureUpdates;
}
-
public void setFeatureUpdates(Boolean featureUpdates) {
this.featureUpdates = featureUpdates;
}
public CommPrefsInput securityUpdates(Boolean securityUpdates) {
-
this.securityUpdates = securityUpdates;
return this;
}
- /**
+ /**
* user preference to receive security updates
* @return securityUpdates
- **/
+ */
@javax.annotation.Nonnull
public Boolean getSecurityUpdates() {
return securityUpdates;
}
-
public void setSecurityUpdates(Boolean securityUpdates) {
this.securityUpdates = securityUpdates;
}
@@ -235,12 +227,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("securityUpdates");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CommPrefsInput
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CommPrefsInput
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CommPrefsInput.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -288,7 +280,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -327,22 +324,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CommPrefsInput given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CommPrefsInput
- * @throws IOException if the JSON string is invalid with respect to CommPrefsInput
- */
+ /**
+ * Create an instance of CommPrefsInput given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CommPrefsInput
+ * @throws IOException if the JSON string is invalid with respect to CommPrefsInput
+ */
public static CommPrefsInput fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CommPrefsInput.class);
}
- /**
- * Convert an instance of CommPrefsInput to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CommPrefsInput to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Commit.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Commit.java
index b33fc183ced..0866df91c0e 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Commit.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Commit.java
@@ -41,12 +41,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -54,7 +52,7 @@
/**
* Commit
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Commit {
public static final String SERIALIZED_NAME_ID = "id";
@SerializedName(SERIALIZED_NAME_ID)
@@ -96,28 +94,25 @@ public Commit() {
}
public Commit id(String id) {
-
this.id = id;
return this;
}
- /**
+ /**
* Get id
* @return id
- **/
+ */
@javax.annotation.Nonnull
public String getId() {
return id;
}
-
public void setId(String id) {
this.id = id;
}
public Commit parents(List parents) {
-
this.parents = parents;
return this;
}
@@ -130,107 +125,97 @@ public Commit addParentsItem(String parentsItem) {
return this;
}
- /**
+ /**
* Get parents
* @return parents
- **/
+ */
@javax.annotation.Nonnull
public List getParents() {
return parents;
}
-
public void setParents(List parents) {
this.parents = parents;
}
public Commit committer(String committer) {
-
this.committer = committer;
return this;
}
- /**
+ /**
* Get committer
* @return committer
- **/
+ */
@javax.annotation.Nonnull
public String getCommitter() {
return committer;
}
-
public void setCommitter(String committer) {
this.committer = committer;
}
public Commit message(String message) {
-
this.message = message;
return this;
}
- /**
+ /**
* Get message
* @return message
- **/
+ */
@javax.annotation.Nonnull
public String getMessage() {
return message;
}
-
public void setMessage(String message) {
this.message = message;
}
public Commit creationDate(Long creationDate) {
-
this.creationDate = creationDate;
return this;
}
- /**
+ /**
* Unix Epoch in seconds
* @return creationDate
- **/
+ */
@javax.annotation.Nonnull
public Long getCreationDate() {
return creationDate;
}
-
public void setCreationDate(Long creationDate) {
this.creationDate = creationDate;
}
public Commit metaRangeId(String metaRangeId) {
-
this.metaRangeId = metaRangeId;
return this;
}
- /**
+ /**
* Get metaRangeId
* @return metaRangeId
- **/
+ */
@javax.annotation.Nonnull
public String getMetaRangeId() {
return metaRangeId;
}
-
public void setMetaRangeId(String metaRangeId) {
this.metaRangeId = metaRangeId;
}
public Commit metadata(Map metadata) {
-
this.metadata = metadata;
return this;
}
@@ -243,60 +228,55 @@ public Commit putMetadataItem(String key, String metadataItem) {
return this;
}
- /**
+ /**
* Get metadata
* @return metadata
- **/
+ */
@javax.annotation.Nullable
public Map getMetadata() {
return metadata;
}
-
public void setMetadata(Map metadata) {
this.metadata = metadata;
}
public Commit generation(Long generation) {
-
this.generation = generation;
return this;
}
- /**
+ /**
* Get generation
* @return generation
- **/
+ */
@javax.annotation.Nullable
public Long getGeneration() {
return generation;
}
-
public void setGeneration(Long generation) {
this.generation = generation;
}
public Commit version(Integer version) {
-
this.version = version;
return this;
}
- /**
+ /**
* Get version
* minimum: 0
* maximum: 1
* @return version
- **/
+ */
@javax.annotation.Nullable
public Integer getVersion() {
return version;
}
-
public void setVersion(Integer version) {
this.version = version;
}
@@ -429,12 +409,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("meta_range_id");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to Commit
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to Commit
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!Commit.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -497,7 +477,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -536,22 +521,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of Commit given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of Commit
- * @throws IOException if the JSON string is invalid with respect to Commit
- */
+ /**
+ * Create an instance of Commit given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of Commit
+ * @throws IOException if the JSON string is invalid with respect to Commit
+ */
public static Commit fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, Commit.class);
}
- /**
- * Convert an instance of Commit to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of Commit to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitCreation.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitCreation.java
index 2cd000671f7..8e33c8d4702 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitCreation.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitCreation.java
@@ -39,12 +39,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -52,7 +50,7 @@
/**
* CommitCreation
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CommitCreation {
public static final String SERIALIZED_NAME_MESSAGE = "message";
@SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -78,28 +76,25 @@ public CommitCreation() {
}
public CommitCreation message(String message) {
-
this.message = message;
return this;
}
- /**
+ /**
* Get message
* @return message
- **/
+ */
@javax.annotation.Nonnull
public String getMessage() {
return message;
}
-
public void setMessage(String message) {
this.message = message;
}
public CommitCreation metadata(Map metadata) {
-
this.metadata = metadata;
return this;
}
@@ -112,79 +107,72 @@ public CommitCreation putMetadataItem(String key, String metadataItem) {
return this;
}
- /**
+ /**
* Get metadata
* @return metadata
- **/
+ */
@javax.annotation.Nullable
public Map getMetadata() {
return metadata;
}
-
public void setMetadata(Map metadata) {
this.metadata = metadata;
}
public CommitCreation date(Long date) {
-
this.date = date;
return this;
}
- /**
+ /**
* set date to override creation date in the commit (Unix Epoch in seconds)
* @return date
- **/
+ */
@javax.annotation.Nullable
public Long getDate() {
return date;
}
-
public void setDate(Long date) {
this.date = date;
}
public CommitCreation allowEmpty(Boolean allowEmpty) {
-
this.allowEmpty = allowEmpty;
return this;
}
- /**
+ /**
* sets whether a commit can contain no changes
* @return allowEmpty
- **/
+ */
@javax.annotation.Nullable
public Boolean getAllowEmpty() {
return allowEmpty;
}
-
public void setAllowEmpty(Boolean allowEmpty) {
this.allowEmpty = allowEmpty;
}
public CommitCreation force(Boolean force) {
-
this.force = force;
return this;
}
- /**
+ /**
* Get force
* @return force
- **/
+ */
@javax.annotation.Nullable
public Boolean getForce() {
return force;
}
-
public void setForce(Boolean force) {
this.force = force;
}
@@ -300,12 +288,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("message");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CommitCreation
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CommitCreation
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CommitCreation.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -353,7 +341,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -392,22 +385,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CommitCreation given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CommitCreation
- * @throws IOException if the JSON string is invalid with respect to CommitCreation
- */
+ /**
+ * Create an instance of CommitCreation given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CommitCreation
+ * @throws IOException if the JSON string is invalid with respect to CommitCreation
+ */
public static CommitCreation fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CommitCreation.class);
}
- /**
- * Convert an instance of CommitCreation to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CommitCreation to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitList.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitList.java
index 07a18b89aa8..8f31c765b6c 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitList.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitList.java
@@ -41,12 +41,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -54,7 +52,7 @@
/**
* CommitList
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CommitList {
public static final String SERIALIZED_NAME_PAGINATION = "pagination";
@SerializedName(SERIALIZED_NAME_PAGINATION)
@@ -68,28 +66,25 @@ public CommitList() {
}
public CommitList pagination(Pagination pagination) {
-
this.pagination = pagination;
return this;
}
- /**
+ /**
* Get pagination
* @return pagination
- **/
+ */
@javax.annotation.Nonnull
public Pagination getPagination() {
return pagination;
}
-
public void setPagination(Pagination pagination) {
this.pagination = pagination;
}
public CommitList results(List results) {
-
this.results = results;
return this;
}
@@ -102,16 +97,15 @@ public CommitList addResultsItem(Commit resultsItem) {
return this;
}
- /**
+ /**
* Get results
* @return results
- **/
+ */
@javax.annotation.Nonnull
public List getResults() {
return results;
}
-
public void setResults(List results) {
this.results = results;
}
@@ -219,12 +213,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("results");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CommitList
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CommitList
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CommitList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -281,7 +275,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -320,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CommitList given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CommitList
- * @throws IOException if the JSON string is invalid with respect to CommitList
- */
+ /**
+ * Create an instance of CommitList given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CommitList
+ * @throws IOException if the JSON string is invalid with respect to CommitList
+ */
public static CommitList fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CommitList.class);
}
- /**
- * Convert an instance of CommitList to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CommitList to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitOverrides.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitOverrides.java
index c70842c779a..e244c2252a7 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitOverrides.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitOverrides.java
@@ -39,12 +39,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -52,7 +50,7 @@
/**
* CommitOverrides
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CommitOverrides {
public static final String SERIALIZED_NAME_MESSAGE = "message";
@SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -66,28 +64,25 @@ public CommitOverrides() {
}
public CommitOverrides message(String message) {
-
this.message = message;
return this;
}
- /**
+ /**
* replace the commit message
* @return message
- **/
+ */
@javax.annotation.Nullable
public String getMessage() {
return message;
}
-
public void setMessage(String message) {
this.message = message;
}
public CommitOverrides metadata(Map metadata) {
-
this.metadata = metadata;
return this;
}
@@ -100,16 +95,15 @@ public CommitOverrides putMetadataItem(String key, String metadataItem) {
return this;
}
- /**
+ /**
* replace the metadata of the commit
* @return metadata
- **/
+ */
@javax.annotation.Nullable
public Map getMetadata() {
return metadata;
}
-
public void setMetadata(Map metadata) {
this.metadata = metadata;
}
@@ -215,12 +209,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields = new HashSet();
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CommitOverrides
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CommitOverrides
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CommitOverrides.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -261,7 +255,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -300,22 +299,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CommitOverrides given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CommitOverrides
- * @throws IOException if the JSON string is invalid with respect to CommitOverrides
- */
+ /**
+ * Create an instance of CommitOverrides given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CommitOverrides
+ * @throws IOException if the JSON string is invalid with respect to CommitOverrides
+ */
public static CommitOverrides fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CommitOverrides.class);
}
- /**
- * Convert an instance of CommitOverrides to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CommitOverrides to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitRecordCreation.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitRecordCreation.java
index 4e9201bbac3..eee5d16f576 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitRecordCreation.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CommitRecordCreation.java
@@ -41,12 +41,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -54,7 +52,7 @@
/**
* CommitRecordCreation
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CommitRecordCreation {
public static final String SERIALIZED_NAME_COMMIT_ID = "commit_id";
@SerializedName(SERIALIZED_NAME_COMMIT_ID)
@@ -100,135 +98,122 @@ public CommitRecordCreation() {
}
public CommitRecordCreation commitId(String commitId) {
-
this.commitId = commitId;
return this;
}
- /**
+ /**
* id of the commit record
* @return commitId
- **/
+ */
@javax.annotation.Nonnull
public String getCommitId() {
return commitId;
}
-
public void setCommitId(String commitId) {
this.commitId = commitId;
}
public CommitRecordCreation version(Integer version) {
-
this.version = version;
return this;
}
- /**
+ /**
* version of the commit record
* minimum: 0
* maximum: 1
* @return version
- **/
+ */
@javax.annotation.Nonnull
public Integer getVersion() {
return version;
}
-
public void setVersion(Integer version) {
this.version = version;
}
public CommitRecordCreation committer(String committer) {
-
this.committer = committer;
return this;
}
- /**
+ /**
* committer of the commit record
* @return committer
- **/
+ */
@javax.annotation.Nonnull
public String getCommitter() {
return committer;
}
-
public void setCommitter(String committer) {
this.committer = committer;
}
public CommitRecordCreation message(String message) {
-
this.message = message;
return this;
}
- /**
+ /**
* message of the commit record
* @return message
- **/
+ */
@javax.annotation.Nonnull
public String getMessage() {
return message;
}
-
public void setMessage(String message) {
this.message = message;
}
public CommitRecordCreation metarangeId(String metarangeId) {
-
this.metarangeId = metarangeId;
return this;
}
- /**
+ /**
* metarange_id of the commit record
* @return metarangeId
- **/
+ */
@javax.annotation.Nonnull
public String getMetarangeId() {
return metarangeId;
}
-
public void setMetarangeId(String metarangeId) {
this.metarangeId = metarangeId;
}
public CommitRecordCreation creationDate(Long creationDate) {
-
this.creationDate = creationDate;
return this;
}
- /**
+ /**
* Unix Epoch in seconds
* @return creationDate
- **/
+ */
@javax.annotation.Nonnull
public Long getCreationDate() {
return creationDate;
}
-
public void setCreationDate(Long creationDate) {
this.creationDate = creationDate;
}
public CommitRecordCreation parents(List parents) {
-
this.parents = parents;
return this;
}
@@ -241,23 +226,21 @@ public CommitRecordCreation addParentsItem(String parentsItem) {
return this;
}
- /**
+ /**
* parents of the commit record
* @return parents
- **/
+ */
@javax.annotation.Nonnull
public List getParents() {
return parents;
}
-
public void setParents(List parents) {
this.parents = parents;
}
public CommitRecordCreation metadata(Map metadata) {
-
this.metadata = metadata;
return this;
}
@@ -270,58 +253,53 @@ public CommitRecordCreation putMetadataItem(String key, String metadataItem) {
return this;
}
- /**
+ /**
* metadata of the commit record
* @return metadata
- **/
+ */
@javax.annotation.Nullable
public Map getMetadata() {
return metadata;
}
-
public void setMetadata(Map metadata) {
this.metadata = metadata;
}
public CommitRecordCreation generation(Long generation) {
-
this.generation = generation;
return this;
}
- /**
+ /**
* generation of the commit record
* @return generation
- **/
+ */
@javax.annotation.Nonnull
public Long getGeneration() {
return generation;
}
-
public void setGeneration(Long generation) {
this.generation = generation;
}
public CommitRecordCreation force(Boolean force) {
-
this.force = force;
return this;
}
- /**
+ /**
* Get force
* @return force
- **/
+ */
@javax.annotation.Nullable
public Boolean getForce() {
return force;
}
-
public void setForce(Boolean force) {
this.force = force;
}
@@ -459,12 +437,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("generation");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CommitRecordCreation
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CommitRecordCreation
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CommitRecordCreation.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -527,7 +505,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -566,22 +549,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CommitRecordCreation given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CommitRecordCreation
- * @throws IOException if the JSON string is invalid with respect to CommitRecordCreation
- */
+ /**
+ * Create an instance of CommitRecordCreation given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CommitRecordCreation
+ * @throws IOException if the JSON string is invalid with respect to CommitRecordCreation
+ */
public static CommitRecordCreation fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CommitRecordCreation.class);
}
- /**
- * Convert an instance of CommitRecordCreation to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CommitRecordCreation to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CompletePresignMultipartUpload.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CompletePresignMultipartUpload.java
index 5b700352b08..1b018fc3c74 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CompletePresignMultipartUpload.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CompletePresignMultipartUpload.java
@@ -42,12 +42,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -55,7 +53,7 @@
/**
* CompletePresignMultipartUpload
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CompletePresignMultipartUpload {
public static final String SERIALIZED_NAME_PHYSICAL_ADDRESS = "physical_address";
@SerializedName(SERIALIZED_NAME_PHYSICAL_ADDRESS)
@@ -77,28 +75,25 @@ public CompletePresignMultipartUpload() {
}
public CompletePresignMultipartUpload physicalAddress(String physicalAddress) {
-
this.physicalAddress = physicalAddress;
return this;
}
- /**
+ /**
* Get physicalAddress
* @return physicalAddress
- **/
+ */
@javax.annotation.Nonnull
public String getPhysicalAddress() {
return physicalAddress;
}
-
public void setPhysicalAddress(String physicalAddress) {
this.physicalAddress = physicalAddress;
}
public CompletePresignMultipartUpload parts(List parts) {
-
this.parts = parts;
return this;
}
@@ -111,23 +106,21 @@ public CompletePresignMultipartUpload addPartsItem(UploadPart partsItem) {
return this;
}
- /**
+ /**
* List of uploaded parts, should be ordered by ascending part number
* @return parts
- **/
+ */
@javax.annotation.Nonnull
public List getParts() {
return parts;
}
-
public void setParts(List parts) {
this.parts = parts;
}
public CompletePresignMultipartUpload userMetadata(Map userMetadata) {
-
this.userMetadata = userMetadata;
return this;
}
@@ -140,37 +133,34 @@ public CompletePresignMultipartUpload putUserMetadataItem(String key, String use
return this;
}
- /**
+ /**
* Get userMetadata
* @return userMetadata
- **/
+ */
@javax.annotation.Nullable
public Map getUserMetadata() {
return userMetadata;
}
-
public void setUserMetadata(Map userMetadata) {
this.userMetadata = userMetadata;
}
public CompletePresignMultipartUpload contentType(String contentType) {
-
this.contentType = contentType;
return this;
}
- /**
+ /**
* Object media type
* @return contentType
- **/
+ */
@javax.annotation.Nullable
public String getContentType() {
return contentType;
}
-
public void setContentType(String contentType) {
this.contentType = contentType;
}
@@ -284,12 +274,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("parts");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CompletePresignMultipartUpload
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CompletePresignMultipartUpload
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CompletePresignMultipartUpload.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -350,7 +340,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -389,22 +384,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CompletePresignMultipartUpload given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CompletePresignMultipartUpload
- * @throws IOException if the JSON string is invalid with respect to CompletePresignMultipartUpload
- */
+ /**
+ * Create an instance of CompletePresignMultipartUpload given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CompletePresignMultipartUpload
+ * @throws IOException if the JSON string is invalid with respect to CompletePresignMultipartUpload
+ */
public static CompletePresignMultipartUpload fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CompletePresignMultipartUpload.class);
}
- /**
- * Convert an instance of CompletePresignMultipartUpload to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CompletePresignMultipartUpload to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Config.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Config.java
index 296d9134df1..40efa328ec2 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Config.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Config.java
@@ -39,12 +39,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -52,7 +50,7 @@
/**
* Config
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Config {
public static final String SERIALIZED_NAME_VERSION_CONFIG = "version_config";
@SerializedName(SERIALIZED_NAME_VERSION_CONFIG)
@@ -66,42 +64,38 @@ public Config() {
}
public Config versionConfig(VersionConfig versionConfig) {
-
this.versionConfig = versionConfig;
return this;
}
- /**
+ /**
* Get versionConfig
* @return versionConfig
- **/
+ */
@javax.annotation.Nullable
public VersionConfig getVersionConfig() {
return versionConfig;
}
-
public void setVersionConfig(VersionConfig versionConfig) {
this.versionConfig = versionConfig;
}
public Config storageConfig(StorageConfig storageConfig) {
-
this.storageConfig = storageConfig;
return this;
}
- /**
+ /**
* Get storageConfig
* @return storageConfig
- **/
+ */
@javax.annotation.Nullable
public StorageConfig getStorageConfig() {
return storageConfig;
}
-
public void setStorageConfig(StorageConfig storageConfig) {
this.storageConfig = storageConfig;
}
@@ -207,12 +201,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields = new HashSet();
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to Config
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to Config
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!Config.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -258,7 +252,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -297,22 +296,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of Config given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of Config
- * @throws IOException if the JSON string is invalid with respect to Config
- */
+ /**
+ * Create an instance of Config given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of Config
+ * @throws IOException if the JSON string is invalid with respect to Config
+ */
public static Config fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, Config.class);
}
- /**
- * Convert an instance of Config to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of Config to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Credentials.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Credentials.java
index 59b4afdd3c2..c99a658e2c1 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Credentials.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Credentials.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* Credentials
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Credentials {
public static final String SERIALIZED_NAME_ACCESS_KEY_ID = "access_key_id";
@SerializedName(SERIALIZED_NAME_ACCESS_KEY_ID)
@@ -64,42 +62,38 @@ public Credentials() {
}
public Credentials accessKeyId(String accessKeyId) {
-
this.accessKeyId = accessKeyId;
return this;
}
- /**
+ /**
* Get accessKeyId
* @return accessKeyId
- **/
+ */
@javax.annotation.Nonnull
public String getAccessKeyId() {
return accessKeyId;
}
-
public void setAccessKeyId(String accessKeyId) {
this.accessKeyId = accessKeyId;
}
public Credentials creationDate(Long creationDate) {
-
this.creationDate = creationDate;
return this;
}
- /**
+ /**
* Unix Epoch in seconds
* @return creationDate
- **/
+ */
@javax.annotation.Nonnull
public Long getCreationDate() {
return creationDate;
}
-
public void setCreationDate(Long creationDate) {
this.creationDate = creationDate;
}
@@ -207,12 +201,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("creation_date");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to Credentials
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to Credentials
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!Credentials.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -260,7 +254,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -299,22 +298,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of Credentials given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of Credentials
- * @throws IOException if the JSON string is invalid with respect to Credentials
- */
+ /**
+ * Create an instance of Credentials given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of Credentials
+ * @throws IOException if the JSON string is invalid with respect to Credentials
+ */
public static Credentials fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, Credentials.class);
}
- /**
- * Convert an instance of Credentials to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of Credentials to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsList.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsList.java
index 5ff00a3eb9d..c8fa1522368 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsList.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsList.java
@@ -41,12 +41,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -54,7 +52,7 @@
/**
* CredentialsList
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CredentialsList {
public static final String SERIALIZED_NAME_PAGINATION = "pagination";
@SerializedName(SERIALIZED_NAME_PAGINATION)
@@ -68,28 +66,25 @@ public CredentialsList() {
}
public CredentialsList pagination(Pagination pagination) {
-
this.pagination = pagination;
return this;
}
- /**
+ /**
* Get pagination
* @return pagination
- **/
+ */
@javax.annotation.Nonnull
public Pagination getPagination() {
return pagination;
}
-
public void setPagination(Pagination pagination) {
this.pagination = pagination;
}
public CredentialsList results(List results) {
-
this.results = results;
return this;
}
@@ -102,16 +97,15 @@ public CredentialsList addResultsItem(Credentials resultsItem) {
return this;
}
- /**
+ /**
* Get results
* @return results
- **/
+ */
@javax.annotation.Nonnull
public List getResults() {
return results;
}
-
public void setResults(List results) {
this.results = results;
}
@@ -219,12 +213,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("results");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CredentialsList
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CredentialsList
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CredentialsList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -281,7 +275,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -320,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CredentialsList given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CredentialsList
- * @throws IOException if the JSON string is invalid with respect to CredentialsList
- */
+ /**
+ * Create an instance of CredentialsList given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CredentialsList
+ * @throws IOException if the JSON string is invalid with respect to CredentialsList
+ */
public static CredentialsList fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CredentialsList.class);
}
- /**
- * Convert an instance of CredentialsList to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CredentialsList to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsWithSecret.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsWithSecret.java
index e857102ccd0..1da68287a71 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsWithSecret.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CredentialsWithSecret.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* CredentialsWithSecret
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CredentialsWithSecret {
public static final String SERIALIZED_NAME_ACCESS_KEY_ID = "access_key_id";
@SerializedName(SERIALIZED_NAME_ACCESS_KEY_ID)
@@ -68,63 +66,57 @@ public CredentialsWithSecret() {
}
public CredentialsWithSecret accessKeyId(String accessKeyId) {
-
this.accessKeyId = accessKeyId;
return this;
}
- /**
+ /**
* Get accessKeyId
* @return accessKeyId
- **/
+ */
@javax.annotation.Nonnull
public String getAccessKeyId() {
return accessKeyId;
}
-
public void setAccessKeyId(String accessKeyId) {
this.accessKeyId = accessKeyId;
}
public CredentialsWithSecret secretAccessKey(String secretAccessKey) {
-
this.secretAccessKey = secretAccessKey;
return this;
}
- /**
+ /**
* Get secretAccessKey
* @return secretAccessKey
- **/
+ */
@javax.annotation.Nonnull
public String getSecretAccessKey() {
return secretAccessKey;
}
-
public void setSecretAccessKey(String secretAccessKey) {
this.secretAccessKey = secretAccessKey;
}
public CredentialsWithSecret creationDate(Long creationDate) {
-
this.creationDate = creationDate;
return this;
}
- /**
+ /**
* Unix Epoch in seconds
* @return creationDate
- **/
+ */
@javax.annotation.Nonnull
public Long getCreationDate() {
return creationDate;
}
-
public void setCreationDate(Long creationDate) {
this.creationDate = creationDate;
}
@@ -236,12 +228,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("creation_date");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CredentialsWithSecret
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CredentialsWithSecret
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CredentialsWithSecret.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -292,7 +284,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -331,22 +328,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CredentialsWithSecret given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CredentialsWithSecret
- * @throws IOException if the JSON string is invalid with respect to CredentialsWithSecret
- */
+ /**
+ * Create an instance of CredentialsWithSecret given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CredentialsWithSecret
+ * @throws IOException if the JSON string is invalid with respect to CredentialsWithSecret
+ */
public static CredentialsWithSecret fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CredentialsWithSecret.class);
}
- /**
- * Convert an instance of CredentialsWithSecret to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CredentialsWithSecret to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CurrentUser.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CurrentUser.java
index 437c8c7055a..3202bc45c92 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/CurrentUser.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/CurrentUser.java
@@ -38,12 +38,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -51,7 +49,7 @@
/**
* CurrentUser
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class CurrentUser {
public static final String SERIALIZED_NAME_USER = "user";
@SerializedName(SERIALIZED_NAME_USER)
@@ -61,21 +59,19 @@ public CurrentUser() {
}
public CurrentUser user(User user) {
-
this.user = user;
return this;
}
- /**
+ /**
* Get user
* @return user
- **/
+ */
@javax.annotation.Nonnull
public User getUser() {
return user;
}
-
public void setUser(User user) {
this.user = user;
}
@@ -179,12 +175,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("user");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to CurrentUser
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to CurrentUser
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!CurrentUser.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -231,7 +227,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -270,22 +271,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of CurrentUser given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of CurrentUser
- * @throws IOException if the JSON string is invalid with respect to CurrentUser
- */
+ /**
+ * Create an instance of CurrentUser given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of CurrentUser
+ * @throws IOException if the JSON string is invalid with respect to CurrentUser
+ */
public static CurrentUser fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, CurrentUser.class);
}
- /**
- * Convert an instance of CurrentUser to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of CurrentUser to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Diff.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Diff.java
index 140ee3594ab..e8bd353577c 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Diff.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Diff.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* Diff
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Diff {
/**
* Gets or Sets type
@@ -103,6 +101,11 @@ public TypeEnum read(final JsonReader jsonReader) throws IOException {
return TypeEnum.fromValue(value);
}
}
+
+ public static void validateJsonElement(JsonElement jsonElement) throws IOException {
+ String value = jsonElement.getAsString();
+ TypeEnum.fromValue(value);
+ }
}
public static final String SERIALIZED_NAME_TYPE = "type";
@@ -158,6 +161,11 @@ public PathTypeEnum read(final JsonReader jsonReader) throws IOException {
return PathTypeEnum.fromValue(value);
}
}
+
+ public static void validateJsonElement(JsonElement jsonElement) throws IOException {
+ String value = jsonElement.getAsString();
+ PathTypeEnum.fromValue(value);
+ }
}
public static final String SERIALIZED_NAME_PATH_TYPE = "path_type";
@@ -172,84 +180,76 @@ public Diff() {
}
public Diff type(TypeEnum type) {
-
this.type = type;
return this;
}
- /**
+ /**
* Get type
* @return type
- **/
+ */
@javax.annotation.Nonnull
public TypeEnum getType() {
return type;
}
-
public void setType(TypeEnum type) {
this.type = type;
}
public Diff path(String path) {
-
this.path = path;
return this;
}
- /**
+ /**
* Get path
* @return path
- **/
+ */
@javax.annotation.Nonnull
public String getPath() {
return path;
}
-
public void setPath(String path) {
this.path = path;
}
public Diff pathType(PathTypeEnum pathType) {
-
this.pathType = pathType;
return this;
}
- /**
+ /**
* Get pathType
* @return pathType
- **/
+ */
@javax.annotation.Nonnull
public PathTypeEnum getPathType() {
return pathType;
}
-
public void setPathType(PathTypeEnum pathType) {
this.pathType = pathType;
}
public Diff sizeBytes(Long sizeBytes) {
-
this.sizeBytes = sizeBytes;
return this;
}
- /**
+ /**
* represents the size of the added/changed/deleted entry
* @return sizeBytes
- **/
+ */
@javax.annotation.Nullable
public Long getSizeBytes() {
return sizeBytes;
}
-
public void setSizeBytes(Long sizeBytes) {
this.sizeBytes = sizeBytes;
}
@@ -364,12 +364,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("path_type");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to Diff
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to Diff
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!Diff.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -387,12 +387,16 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
if (!jsonObj.get("type").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `type` to be a primitive type in the JSON string but got `%s`", jsonObj.get("type").toString()));
}
+ // validate the required field `type`
+ TypeEnum.validateJsonElement(jsonObj.get("type"));
if (!jsonObj.get("path").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `path` to be a primitive type in the JSON string but got `%s`", jsonObj.get("path").toString()));
}
if (!jsonObj.get("path_type").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `path_type` to be a primitive type in the JSON string but got `%s`", jsonObj.get("path_type").toString()));
}
+ // validate the required field `path_type`
+ PathTypeEnum.validateJsonElement(jsonObj.get("path_type"));
}
public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
@@ -423,7 +427,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -462,22 +471,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of Diff given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of Diff
- * @throws IOException if the JSON string is invalid with respect to Diff
- */
+ /**
+ * Create an instance of Diff given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of Diff
+ * @throws IOException if the JSON string is invalid with respect to Diff
+ */
public static Diff fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, Diff.class);
}
- /**
- * Convert an instance of Diff to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of Diff to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/DiffList.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/DiffList.java
index 650ae20f88f..9c6b1d7fa9c 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/DiffList.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/DiffList.java
@@ -41,12 +41,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -54,7 +52,7 @@
/**
* DiffList
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class DiffList {
public static final String SERIALIZED_NAME_PAGINATION = "pagination";
@SerializedName(SERIALIZED_NAME_PAGINATION)
@@ -68,28 +66,25 @@ public DiffList() {
}
public DiffList pagination(Pagination pagination) {
-
this.pagination = pagination;
return this;
}
- /**
+ /**
* Get pagination
* @return pagination
- **/
+ */
@javax.annotation.Nonnull
public Pagination getPagination() {
return pagination;
}
-
public void setPagination(Pagination pagination) {
this.pagination = pagination;
}
public DiffList results(List results) {
-
this.results = results;
return this;
}
@@ -102,16 +97,15 @@ public DiffList addResultsItem(Diff resultsItem) {
return this;
}
- /**
+ /**
* Get results
* @return results
- **/
+ */
@javax.annotation.Nonnull
public List getResults() {
return results;
}
-
public void setResults(List results) {
this.results = results;
}
@@ -219,12 +213,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("results");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to DiffList
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to DiffList
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!DiffList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -281,7 +275,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -320,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of DiffList given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of DiffList
- * @throws IOException if the JSON string is invalid with respect to DiffList
- */
+ /**
+ * Create an instance of DiffList given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of DiffList
+ * @throws IOException if the JSON string is invalid with respect to DiffList
+ */
public static DiffList fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, DiffList.class);
}
- /**
- * Convert an instance of DiffList to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of DiffList to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Error.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Error.java
index 27e98359617..d95eda8bfa6 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Error.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Error.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* Error
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class Error {
public static final String SERIALIZED_NAME_MESSAGE = "message";
@SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -60,21 +58,19 @@ public Error() {
}
public Error message(String message) {
-
this.message = message;
return this;
}
- /**
+ /**
* short message explaining the error
* @return message
- **/
+ */
@javax.annotation.Nonnull
public String getMessage() {
return message;
}
-
public void setMessage(String message) {
this.message = message;
}
@@ -178,12 +174,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("message");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to Error
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to Error
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!Error.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -231,7 +227,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -270,22 +271,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of Error given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of Error
- * @throws IOException if the JSON string is invalid with respect to Error
- */
+ /**
+ * Create an instance of Error given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of Error
+ * @throws IOException if the JSON string is invalid with respect to Error
+ */
public static Error fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, Error.class);
}
- /**
- * Convert an instance of Error to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of Error to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ErrorNoACL.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ErrorNoACL.java
index bb9b47e0d57..14c886e2b0e 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ErrorNoACL.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ErrorNoACL.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* ErrorNoACL
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ErrorNoACL {
public static final String SERIALIZED_NAME_MESSAGE = "message";
@SerializedName(SERIALIZED_NAME_MESSAGE)
@@ -64,42 +62,38 @@ public ErrorNoACL() {
}
public ErrorNoACL message(String message) {
-
this.message = message;
return this;
}
- /**
+ /**
* short message explaining the error
* @return message
- **/
+ */
@javax.annotation.Nonnull
public String getMessage() {
return message;
}
-
public void setMessage(String message) {
this.message = message;
}
public ErrorNoACL noAcl(Boolean noAcl) {
-
this.noAcl = noAcl;
return this;
}
- /**
+ /**
* true if the group exists but has no ACL
* @return noAcl
- **/
+ */
@javax.annotation.Nullable
public Boolean getNoAcl() {
return noAcl;
}
-
public void setNoAcl(Boolean noAcl) {
this.noAcl = noAcl;
}
@@ -206,12 +200,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("message");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to ErrorNoACL
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to ErrorNoACL
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!ErrorNoACL.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -259,7 +253,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -298,22 +297,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of ErrorNoACL given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of ErrorNoACL
- * @throws IOException if the JSON string is invalid with respect to ErrorNoACL
- */
+ /**
+ * Create an instance of ErrorNoACL given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of ErrorNoACL
+ * @throws IOException if the JSON string is invalid with respect to ErrorNoACL
+ */
public static ErrorNoACL fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, ErrorNoACL.class);
}
- /**
- * Convert an instance of ErrorNoACL to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of ErrorNoACL to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalLoginInformation.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalLoginInformation.java
index ae63343c140..05bd18f213f 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalLoginInformation.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalLoginInformation.java
@@ -37,12 +37,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -50,7 +48,7 @@
/**
* ExternalLoginInformation
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ExternalLoginInformation {
public static final String SERIALIZED_NAME_TOKEN_EXPIRATION_DURATION = "token_expiration_duration";
@SerializedName(SERIALIZED_NAME_TOKEN_EXPIRATION_DURATION)
@@ -64,42 +62,38 @@ public ExternalLoginInformation() {
}
public ExternalLoginInformation tokenExpirationDuration(Integer tokenExpirationDuration) {
-
this.tokenExpirationDuration = tokenExpirationDuration;
return this;
}
- /**
+ /**
* Get tokenExpirationDuration
* @return tokenExpirationDuration
- **/
+ */
@javax.annotation.Nullable
public Integer getTokenExpirationDuration() {
return tokenExpirationDuration;
}
-
public void setTokenExpirationDuration(Integer tokenExpirationDuration) {
this.tokenExpirationDuration = tokenExpirationDuration;
}
public ExternalLoginInformation identityRequest(Object identityRequest) {
-
this.identityRequest = identityRequest;
return this;
}
- /**
+ /**
* Get identityRequest
* @return identityRequest
- **/
+ */
@javax.annotation.Nonnull
public Object getIdentityRequest() {
return identityRequest;
}
-
public void setIdentityRequest(Object identityRequest) {
this.identityRequest = identityRequest;
}
@@ -206,12 +200,12 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("identityRequest");
}
- /**
- * Validates the JSON Element and throws an exception if issues found
- *
- * @param jsonElement JSON Element
- * @throws IOException if the JSON Element is invalid with respect to ExternalLoginInformation
- */
+ /**
+ * Validates the JSON Element and throws an exception if issues found
+ *
+ * @param jsonElement JSON Element
+ * @throws IOException if the JSON Element is invalid with respect to ExternalLoginInformation
+ */
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) {
if (!ExternalLoginInformation.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -256,7 +250,12 @@ else if (entry.getValue() instanceof Boolean)
else if (entry.getValue() instanceof Character)
obj.addProperty(entry.getKey(), (Character) entry.getValue());
else {
- obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+ JsonElement jsonElement = gson.toJsonTree(entry.getValue());
+ if (jsonElement.isJsonArray()) {
+ obj.add(entry.getKey(), jsonElement.getAsJsonArray());
+ } else {
+ obj.add(entry.getKey(), jsonElement.getAsJsonObject());
+ }
}
}
}
@@ -295,22 +294,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
}
}
- /**
- * Create an instance of ExternalLoginInformation given an JSON string
- *
- * @param jsonString JSON string
- * @return An instance of ExternalLoginInformation
- * @throws IOException if the JSON string is invalid with respect to ExternalLoginInformation
- */
+ /**
+ * Create an instance of ExternalLoginInformation given an JSON string
+ *
+ * @param jsonString JSON string
+ * @return An instance of ExternalLoginInformation
+ * @throws IOException if the JSON string is invalid with respect to ExternalLoginInformation
+ */
public static ExternalLoginInformation fromJson(String jsonString) throws IOException {
return JSON.getGson().fromJson(jsonString, ExternalLoginInformation.class);
}
- /**
- * Convert an instance of ExternalLoginInformation to an JSON string
- *
- * @return JSON string
- */
+ /**
+ * Convert an instance of ExternalLoginInformation to an JSON string
+ *
+ * @return JSON string
+ */
public String toJson() {
return JSON.getGson().toJson(this);
}
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalPrincipal.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalPrincipal.java
index df201f1b84e..dfe9c243655 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalPrincipal.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/ExternalPrincipal.java
@@ -40,12 +40,10 @@
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import io.lakefs.clients.sdk.JSON;
@@ -53,7 +51,7 @@
/**
* ExternalPrincipal
*/
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class ExternalPrincipal {
public static final String SERIALIZED_NAME_ID = "id";
@SerializedName(SERIALIZED_NAME_ID)
@@ -65,55 +63,50 @@ public class ExternalPrincipal {
public static final String SERIALIZED_NAME_SETTINGS = "settings";
@SerializedName(SERIALIZED_NAME_SETTINGS)
- private List