Throw error instead of -1

Author: HonahX

polaris-core/src/main/java/org/apache/polaris/core/policy/PolicyEntity.java

@@ -53,12 +53,11 @@ public PolicyType getPolicyType() {
 
   @JsonIgnore
   public int getPolicyTypeCode() {
+    Preconditions.checkArgument(
+        getPropertiesAsMap().containsKey(POLICY_TYPE_CODE_KEY),
+        "Invalid policy entity: policy type must exist");
     String policyTypeCode = getPropertiesAsMap().get(POLICY_TYPE_CODE_KEY);
-    if (policyTypeCode != null) {
-      return Integer.parseInt(policyTypeCode);
-    }
-
-    return -1;
+    return Integer.parseInt(policyTypeCode);
   }
 
   @JsonIgnore
@@ -93,7 +92,7 @@ public Builder(PolicyEntity original) {
     @Override
     public PolicyEntity build() {
       Preconditions.checkArgument(
-          properties.get(POLICY_TYPE_CODE_KEY) != null, "Policy type must be specified");
+          properties.containsKey(POLICY_TYPE_CODE_KEY), "Policy type must be specified");
 
       return new PolicyEntity(buildBase());
     }
@@ -107,6 +106,7 @@ public Builder setParentNamespace(Namespace namespace) {
     }
 
     public Builder setPolicyType(PolicyType policyType) {
+      Preconditions.checkArgument(policyType != null, "Policy type must be specified");
       properties.put(POLICY_TYPE_CODE_KEY, Integer.toString(policyType.getCode()));
       return this;
     }

polaris-core/src/test/java/org/apache/polaris/core/policy/PolicyEntityTest.java

@@ -22,6 +22,7 @@
 import org.apache.iceberg.catalog.Namespace;
 import org.apache.polaris.core.entity.PolarisEntityType;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -49,4 +50,16 @@ public void testPolicyEntity(PolicyType policyType) {
     Assertions.assertThat(entity.getPolicyTypeCode()).isEqualTo(policyType.getCode());
     Assertions.assertThat(entity.getContent()).isEqualTo("test_content");
   }
+
+  @Test
+  public void testBuildPolicyEntityWithoutPolicyTye() {
+    Assertions.assertThatThrownBy(
+            () ->
+                new PolicyEntity.Builder(Namespace.of("NS1"), "testPolicy", null)
+                    .setContent("test_content")
+                    .setPolicyVersion(0)
+                    .build())
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Policy type must be specified");
+  }
 }