snazy
diff --git a/‎.asf.yaml‎
Lines changed: 1 addition & 0 deletions b/‎.asf.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎api/polaris-catalog-service/build.gradle.kts‎
Lines changed: 4 additions & 1 deletion b/‎api/polaris-catalog-service/build.gradle.kts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎api/polaris-catalog-service/src/main/java/org/apache/polaris/service/types/PolicyIdentifier.java‎
Lines changed: 140 additions & 0 deletions b/‎api/polaris-catalog-service/src/main/java/org/apache/polaris/service/types/PolicyIdentifier.java‎
Lines changed: 140 additions & 0 deletions
diff --git a/‎build-logic/src/main/kotlin/polaris-java.gradle.kts‎
Lines changed: 17 additions & 10 deletions b/‎build-logic/src/main/kotlin/polaris-java.gradle.kts‎
Lines changed: 17 additions & 10 deletions
diff --git a/‎build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt‎
Lines changed: 0 additions & 6 deletions b/‎build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎build-logic/src/main/kotlin/publishing/configurePom.kt‎
Lines changed: 4 additions & 1 deletion b/‎build-logic/src/main/kotlin/publishing/configurePom.kt‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎build-logic/src/main/kotlin/publishing/digest-task.kt‎
Lines changed: 66 additions & 0 deletions b/‎build-logic/src/main/kotlin/publishing/digest-task.kt‎
Lines changed: 66 additions & 0 deletions
diff --git a/‎build-logic/src/main/kotlin/publishing/rootProject.kt‎
Lines changed: 16 additions & 15 deletions b/‎build-logic/src/main/kotlin/publishing/rootProject.kt‎
Lines changed: 16 additions & 15 deletions
diff --git a/‎build-logic/src/main/kotlin/publishing/util.kt‎
Lines changed: 0 additions & 21 deletions b/‎build-logic/src/main/kotlin/publishing/util.kt‎
Lines changed: 0 additions & 21 deletions
diff --git a/‎client/python/pyproject.toml‎
Lines changed: 1 addition & 1 deletion b/‎client/python/pyproject.toml‎
Lines changed: 1 addition & 1 deletion
@@ -72,6 +72,7 @@ github:
     # Adding renovate-bot as a collaborator, so CI doesn't need to be manually approved
     - renovate-bot
     - singhpk234
+    - gh-yzou
 
 notifications:
   commits:      commits@polaris.apache.org
 
@@ -36,7 +36,6 @@ val policyManagementModels =
     "CatalogIdentifier",
     "CreatePolicyRequest",
     "LoadPolicyResponse",
-    "PolicyIdentifier",
     "Policy",
     "PolicyAttachmentTarget",
     "AttachPolicyRequest",
@@ -59,6 +58,7 @@ dependencies {
   implementation(libs.jakarta.inject.api)
   implementation(libs.jakarta.validation.api)
   implementation(libs.swagger.annotations)
+  implementation(libs.guava)
 
   implementation(libs.jakarta.servlet.api)
   implementation(libs.jakarta.ws.rs.api)
@@ -103,6 +103,9 @@ openApiGenerate {
       "ErrorModel" to "org.apache.iceberg.rest.responses.ErrorResponse",
       "IcebergErrorResponse" to "org.apache.iceberg.rest.responses.ErrorResponse",
       "TableIdentifier" to "org.apache.iceberg.catalog.TableIdentifier",
+
+      // Custom types defined below
+      "PolicyIdentifier" to "org.apache.polaris.service.types.PolicyIdentifier",
     )
 }
 
 
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.service.types;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+import org.apache.iceberg.catalog.Namespace;
+
+/**
+ * Represents a modified version of the PolicyIdentifier that is different from the one generated by
+ * the OpenAPI generator
+ *
+ * <p>the open api generation inlines the namespace definition, generates a {@code List<String>}
+ * directly, instead of generating a Namespace class. This version uses {@link
+ * org.apache.iceberg.catalog.Namespace} for namespace field.
+ *
+ * <p>TODO: make code generation use {@link org.apache.iceberg.catalog.Namespace} directly
+ */
+public class PolicyIdentifier {
+
+  private final Namespace namespace;
+  private final String name;
+
+  /** Reference to one or more levels of a namespace */
+  @ApiModelProperty(
+      example = "[\"accounting\",\"tax\"]",
+      required = true,
+      value = "Reference to one or more levels of a namespace")
+  @JsonProperty(value = "namespace", required = true)
+  public Namespace getNamespace() {
+    return namespace;
+  }
+
+  /** */
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty(value = "name", required = true)
+  public String getName() {
+    return name;
+  }
+
+  @JsonCreator
+  public PolicyIdentifier(
+      @JsonProperty(value = "namespace", required = true) Namespace namespace,
+      @JsonProperty(value = "name", required = true) String name) {
+    this.namespace = Objects.requireNonNullElse(namespace, Namespace.empty());
+    this.name = name;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static Builder builder(Namespace namespace, String name) {
+    return new Builder(namespace, name);
+  }
+
+  public static final class Builder {
+    private Namespace namespace;
+    private String name;
+
+    private Builder() {}
+
+    private Builder(Namespace namespace, String name) {
+      this.namespace = Objects.requireNonNullElse(namespace, Namespace.empty());
+      this.name = name;
+    }
+
+    public Builder setNamespace(Namespace namespace) {
+      this.namespace = namespace;
+      return this;
+    }
+
+    public Builder setName(String name) {
+      this.name = name;
+      return this;
+    }
+
+    public PolicyIdentifier build() {
+      PolicyIdentifier inst = new PolicyIdentifier(namespace, name);
+      return inst;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    PolicyIdentifier policyIdentifier = (PolicyIdentifier) o;
+    return Objects.equals(this.namespace, policyIdentifier.namespace)
+        && Objects.equals(this.name, policyIdentifier.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(namespace, name);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PolicyIdentifier {\n");
+
+    sb.append("    namespace: ").append(toIndentedString(namespace)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import java.util.Properties
+import net.ltgt.gradle.errorprone.CheckSeverity
 import net.ltgt.gradle.errorprone.errorprone
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
@@ -41,18 +43,23 @@ tasks.withType(JavaCompile::class.java).configureEach {
   options.errorprone.disableWarningsInGeneratedCode = true
   options.errorprone.excludedPaths =
     ".*/${project.layout.buildDirectory.get().asFile.relativeTo(projectDir)}/generated/.*"
-  options.errorprone.error(
-    "DefaultCharset",
-    "FallThrough",
-    "MissingCasesInEnumSwitch",
-    "MissingOverride",
-    "ModifiedButNotUsed",
-    "OrphanedFormatString",
-    "PatternMatchingInstanceof",
-    "StringCaseLocaleUsage",
-  )
+  val errorproneRules = rootProject.projectDir.resolve("codestyle/errorprone-rules.properties")
+  inputs.file(errorproneRules).withPathSensitivity(PathSensitivity.RELATIVE)
+  options.errorprone.checks.putAll(provider { memoizedErrorproneRules(errorproneRules) })
 }
 
+private fun memoizedErrorproneRules(rulesFile: File): Map<String, CheckSeverity> =
+  rulesFile.reader().use {
+    val rules = Properties()
+    rules.load(it)
+    rules
+      .mapKeys { e -> (e.key as String).trim() }
+      .mapValues { e -> (e.value as String).trim() }
+      .filter { e -> e.key.isNotEmpty() && e.value.isNotEmpty() }
+      .mapValues { e -> CheckSeverity.valueOf(e.value) }
+      .toMap()
+  }
+
 tasks.register("compileAll").configure {
   group = "build"
   description = "Runs all compilation and jar tasks"
 
@@ -49,12 +49,6 @@ constructor(objectFactory: ObjectFactory, project: Project) {
     objectFactory
       .fileProperty()
       .convention(project.provider { distributionDir.get().file("${baseName.get()}.tar.gz") })
-  val sourceTarballDigest =
-    objectFactory
-      .fileProperty()
-      .convention(
-        project.provider { distributionDir.get().file("${baseName.get()}.tar.gz.sha512") }
-      )
 
   val mailingLists = objectFactory.listProperty(String::class.java).convention(emptyList())
 
 
@@ -103,7 +103,10 @@ internal fun configurePom(project: Project, mavenPublication: MavenPublication,
               connection.set("scm:git:$codeRepo")
               developerConnection.set("scm:git:$codeRepo")
               url.set("$codeRepo/tree/main")
-              tag.set("main")
+              val version = project.version.toString()
+              if (!version.endsWith("-SNAPSHOT")) {
+                tag.set("apache-polaris-$version")
+              }
             }
             issueManagement { url.set(projectPeople.bugDatabase) }
 
 
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package publishing
+
+import java.security.MessageDigest
+import javax.inject.Inject
+import org.gradle.api.DefaultTask
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
+
+@DisableCachingByDefault
+abstract class GenerateDigest @Inject constructor(objectFactory: ObjectFactory) : DefaultTask() {
+
+  @get:InputFile val file = objectFactory.fileProperty()
+  @get:Input val algorithm = objectFactory.property(String::class.java).convention("SHA-512")
+  @get:OutputFile
+  val outputFile =
+    objectFactory.fileProperty().convention {
+      val input = file.get().asFile
+      val algo = algorithm.get()
+      input.parentFile.resolve("${input.name}-${algo.replace("-", "").lowercase()}")
+    }
+
+  @TaskAction
+  fun generate() {
+    val input = file.get().asFile
+    val digestFile = outputFile.get().asFile
+    val md = MessageDigest.getInstance(algorithm.get())
+    input.inputStream().use {
+      val buffered = it.buffered(8192)
+      val buf = ByteArray(8192)
+      var rd: Int
+      while (true) {
+        rd = buffered.read(buf)
+        if (rd == -1) break
+        md.update(buf, 0, rd)
+      }
+
+      digestFile.writeText(
+        md.digest().joinToString(separator = "") { eachByte -> "%02x".format(eachByte) } +
+          "  ${input.name}"
+      )
+    }
+  }
+}
@@ -61,27 +61,28 @@ internal fun configureOnRootProject(project: Project) =
       workingDir(project.projectDir)
     }
 
-    val digestSourceTarball = tasks.register("digestSourceTarball")
-    digestSourceTarball.configure {
-      mustRunAfter(sourceTarball)
-
-      doFirst {
-        val e = project.extensions.getByType(PublishingHelperExtension::class.java)
-        generateDigest(e.sourceTarball.get().asFile, e.sourceTarballDigest.get().asFile, "SHA-512")
+    val digestSourceTarball =
+      tasks.register<GenerateDigest>("digestSourceTarball") {
+        description = "Generate the source tarball digest"
+        mustRunAfter(sourceTarball)
+        file.set {
+          val e = project.extensions.getByType(PublishingHelperExtension::class.java)
+          e.sourceTarball.get().asFile
+        }
       }
-    }
 
     sourceTarball.configure { finalizedBy(digestSourceTarball) }
 
     if (isSigning) {
-      val signSourceTarball = tasks.register<Sign>("signSourceTarball")
-      signSourceTarball.configure {
-        mustRunAfter(sourceTarball)
-        doFirst {
-          val e = project.extensions.getByType(PublishingHelperExtension::class.java)
-          sign(e.sourceTarball.get().asFile)
+      val signSourceTarball =
+        tasks.register<Sign>("signSourceTarball") {
+          description = "Sign the source tarball"
+          mustRunAfter(sourceTarball)
+          doFirst {
+            val e = project.extensions.getByType(PublishingHelperExtension::class.java)
+            sign(e.sourceTarball.get().asFile)
+          }
         }
-      }
       sourceTarball.configure { finalizedBy(signSourceTarball) }
     }
 
 
@@ -23,10 +23,8 @@ import groovy.json.JsonException
 import groovy.json.JsonSlurper
 import groovy.util.Node
 import groovy.util.NodeList
-import java.io.File
 import java.io.FileNotFoundException
 import java.net.URI
-import java.security.MessageDigest
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.component.ModuleComponentSelector
 import org.gradle.api.artifacts.result.DependencyResult
@@ -58,25 +56,6 @@ internal fun xmlNode(node: Node?, child: String): Node? {
   return null
 }
 
-internal fun generateDigest(input: File, output: File, algorithm: String) {
-  val md = MessageDigest.getInstance(algorithm)
-  input.inputStream().use {
-    val buffered = it.buffered(8192)
-    val buf = ByteArray(8192)
-    var rd: Int
-    while (true) {
-      rd = buffered.read(buf)
-      if (rd == -1) break
-      md.update(buf, 0, rd)
-    }
-
-    output.writeText(
-      md.digest().joinToString(separator = "") { eachByte -> "%02x".format(eachByte) } +
-        "  ${input.name}"
-    )
-  }
-}
-
 internal fun <T : Any> unsafeCast(o: Any?): T {
   @Suppress("UNCHECKED_CAST")
   return o as T
 
@@ -36,7 +36,7 @@ urllib3 = "^1.25.3"
 python-dateutil = ">=2.8.2"
 pydantic = ">=2"
 typing-extensions = ">=4.7.1"
-boto3 = "==1.37.23"
+boto3 = "==1.37.28"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.2.1"