diff --git a/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java index f9d406c873..ae83488e1e 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java @@ -18,9 +18,7 @@ */ package org.apache.polaris.core.entity; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.util.HashMap; @@ -87,39 +85,6 @@ public String getName() { } } - @JsonCreator - private PolarisEntity( - @JsonProperty("catalogId") long catalogId, - @JsonProperty("typeCode") PolarisEntityType type, - @JsonProperty("subTypeCode") PolarisEntitySubType subType, - @JsonProperty("id") long id, - @JsonProperty("parentId") long parentId, - @JsonProperty("name") String name, - @JsonProperty("createTimestamp") long createTimestamp, - @JsonProperty("dropTimestamp") long dropTimestamp, - @JsonProperty("purgeTimestamp") long purgeTimestamp, - @JsonProperty("lastUpdateTimestamp") long lastUpdateTimestamp, - @JsonProperty("properties") String properties, - @JsonProperty("internalProperties") String internalProperties, - @JsonProperty("entityVersion") int entityVersion, - @JsonProperty("grantRecordsVersion") int grantRecordsVersion) { - super( - catalogId, - id, - type.getCode(), - parentId, - name, - subType.getCode(), - createTimestamp, - dropTimestamp, - purgeTimestamp, - lastUpdateTimestamp, - properties, - internalProperties, - grantRecordsVersion, - entityVersion); - } - public PolarisEntity( long catalogId, PolarisEntityType type, diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ChangeTrackingResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ChangeTrackingResult.java index ff4c9b9b58..c2d80972b4 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ChangeTrackingResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ChangeTrackingResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.util.List; @@ -52,16 +50,6 @@ public ChangeTrackingResult(@Nonnull List changeT this.changeTrackingVersions = changeTrackingVersions; } - @JsonCreator - private ChangeTrackingResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("changeTrackingVersions") - List changeTrackingVersions) { - super(returnStatus, extraInformation); - this.changeTrackingVersions = changeTrackingVersions; - } - public List getChangeTrackingVersions() { return changeTrackingVersions; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreateCatalogResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreateCatalogResult.java index b45a2a82a1..83c4c75744 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreateCatalogResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreateCatalogResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.apache.polaris.core.entity.PolarisBaseEntity; @@ -58,17 +56,6 @@ public CreateCatalogResult( this.catalogAdminRole = catalogAdminRole; } - @JsonCreator - private CreateCatalogResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") @Nullable String extraInformation, - @JsonProperty("catalog") @Nonnull PolarisBaseEntity catalog, - @JsonProperty("catalogAdminRole") @Nonnull PolarisBaseEntity catalogAdminRole) { - super(returnStatus, extraInformation); - this.catalog = catalog; - this.catalogAdminRole = catalogAdminRole; - } - public PolarisBaseEntity getCatalog() { return catalog; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreatePrincipalResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreatePrincipalResult.java index 31bc0d037d..0b6352923f 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreatePrincipalResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/CreatePrincipalResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.apache.polaris.core.entity.PolarisBaseEntity; @@ -59,17 +57,6 @@ public CreatePrincipalResult( this.principalSecrets = principalSecrets; } - @JsonCreator - private CreatePrincipalResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") @Nullable String extraInformation, - @JsonProperty("principal") @Nonnull PolarisBaseEntity principal, - @JsonProperty("principalSecrets") @Nonnull PolarisPrincipalSecrets principalSecrets) { - super(returnStatus, extraInformation); - this.principal = principal; - this.principalSecrets = principalSecrets; - } - public PrincipalEntity getPrincipal() { return PrincipalEntity.of(principal); } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/DropEntityResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/DropEntityResult.java index a86df30d8b..4507d4188a 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/DropEntityResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/DropEntityResult.java @@ -18,9 +18,7 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -57,15 +55,6 @@ public DropEntityResult(long cleanupTaskId) { this.cleanupTaskId = cleanupTaskId; } - @JsonCreator - private DropEntityResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("cleanupTaskId") Long cleanupTaskId) { - super(returnStatus, extraInformation); - this.cleanupTaskId = cleanupTaskId; - } - public Long getCleanupTaskId() { return cleanupTaskId; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/EntityResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/EntityResult.java index 518caf92a9..e261f5e838 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/EntityResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/EntityResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.apache.polaris.core.entity.PolarisBaseEntity; @@ -87,15 +85,6 @@ public PolarisEntitySubType getAlreadyExistsEntitySubType() { } } - @JsonCreator - private EntityResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") @Nullable String extraInformation, - @JsonProperty("entity") @Nullable PolarisBaseEntity entity) { - super(returnStatus, extraInformation); - this.entity = entity; - } - public PolarisBaseEntity getEntity() { return entity; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/GenerateEntityIdResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/GenerateEntityIdResult.java index b549427db9..7dfbde5a0a 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/GenerateEntityIdResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/GenerateEntityIdResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -51,15 +49,6 @@ public GenerateEntityIdResult(@Nonnull Long id) { this.id = id; } - @JsonCreator - private GenerateEntityIdResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") @Nullable String extraInformation, - @JsonProperty("id") @Nullable Long id) { - super(returnStatus, extraInformation); - this.id = id; - } - public Long getId() { return id; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadGrantsResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadGrantsResult.java index 4eaa25da33..f0af6628a9 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadGrantsResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadGrantsResult.java @@ -18,9 +18,7 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.util.List; @@ -69,20 +67,6 @@ public LoadGrantsResult( this.entities = entities; } - @JsonCreator - private LoadGrantsResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("grantsVersion") int grantsVersion, - @JsonProperty("grantRecords") List grantRecords, - @JsonProperty("entities") List entities) { - super(returnStatus, extraInformation); - this.grantsVersion = grantsVersion; - this.grantRecords = grantRecords; - // old GS code might not serialize this argument - this.entities = entities; - } - public int getGrantsVersion() { return grantsVersion; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadPolicyMappingsResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadPolicyMappingsResult.java index 48a0277dd9..75ea0e4d54 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadPolicyMappingsResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/LoadPolicyMappingsResult.java @@ -18,9 +18,7 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.util.List; @@ -64,17 +62,6 @@ public LoadPolicyMappingsResult( this.entities = entities; } - @JsonCreator - private LoadPolicyMappingsResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("policyMappingRecords") List mappingRecords, - @JsonProperty("policyEntities") List entities) { - super(returnStatus, extraInformation); - this.mappingRecords = mappingRecords; - this.entities = entities; - } - public List getPolicyMappingRecords() { return mappingRecords; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PolicyAttachmentResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PolicyAttachmentResult.java index ffc7eabdd3..ec21656b6e 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PolicyAttachmentResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PolicyAttachmentResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.apache.polaris.core.policy.PolarisPolicyMappingRecord; @@ -62,15 +60,6 @@ public PolicyAttachmentResult(@Nonnull PolarisPolicyMappingRecord mappingRecord) this.mappingRecord = mappingRecord; } - @JsonCreator - private PolicyAttachmentResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("policyMappingRecord") PolarisPolicyMappingRecord mappingRecord) { - super(returnStatus, extraInformation); - this.mappingRecord = mappingRecord; - } - public PolarisPolicyMappingRecord getPolicyMappingRecord() { return mappingRecord; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrincipalSecretsResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrincipalSecretsResult.java index ed00ffef81..89ad727614 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrincipalSecretsResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrincipalSecretsResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.apache.polaris.core.entity.PolarisPrincipalSecrets; @@ -52,15 +50,6 @@ public PrincipalSecretsResult(@Nonnull PolarisPrincipalSecrets principalSecrets) this.principalSecrets = principalSecrets; } - @JsonCreator - private PrincipalSecretsResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") @Nullable String extraInformation, - @JsonProperty("principalSecrets") @Nonnull PolarisPrincipalSecrets principalSecrets) { - super(returnStatus, extraInformation); - this.principalSecrets = principalSecrets; - } - public PolarisPrincipalSecrets getPrincipalSecrets() { return principalSecrets; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrivilegeResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrivilegeResult.java index a78c91674b..117412715f 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrivilegeResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/PrivilegeResult.java @@ -18,8 +18,6 @@ */ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.apache.polaris.core.entity.PolarisGrantRecord; @@ -51,15 +49,6 @@ public PrivilegeResult(@Nonnull PolarisGrantRecord grantRecord) { this.grantRecord = grantRecord; } - @JsonCreator - private PrivilegeResult( - @JsonProperty("returnStatus") @Nonnull ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("grantRecord") PolarisGrantRecord grantRecord) { - super(returnStatus, extraInformation); - this.grantRecord = grantRecord; - } - public PolarisGrantRecord getGrantRecord() { return grantRecord; } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java index 61eb27da1f..e89b28dc67 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java @@ -19,8 +19,6 @@ package org.apache.polaris.core.persistence.dao.entity; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import java.util.List; @@ -41,15 +39,6 @@ public ResolvedEntitiesResult( this.resolvedEntities = null; } - @JsonCreator - private ResolvedEntitiesResult( - @JsonProperty("returnStatus") ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("resolvedEntities") List resolvedEntities) { - super(returnStatus, extraInformation); - this.resolvedEntities = resolvedEntities; - } - public List getResolvedEntities() { return resolvedEntities; }