Core: resolveAll() must be called before reading resolution results

Author: flyrain

polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java

@@ -68,6 +68,14 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
   // Set when resolveAll is called
   private ResolverStatus primaryResolverStatus = null;
 
+  private ResolverStatus requirePrimaryResolverStatus() {
+    diagnostics.checkNotNull(
+        primaryResolverStatus,
+        "resolver_not_run_before_access",
+        "resolveAll() must be called before reading resolution results");
+    return primaryResolverStatus;
+  }
+
   public PolarisResolutionManifest(
       PolarisDiagnostics diagnostics,
       RealmContext realmContext,
@@ -256,7 +264,7 @@ public Set<PolarisBaseEntity> getAllActivatedPrincipalRoleEntities() {
   }
 
   private @Nullable ResolvedPolarisEntity getResolvedRootContainerEntity() {
-    if (primaryResolverStatus.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
+    if (requirePrimaryResolverStatus().getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
       return null;
     }
     ResolvedPolarisEntity resolvedEntity =
@@ -277,6 +285,7 @@ public PolarisResolvedPathWrapper getResolvedRootContainerEntityAsPath() {
 
   public PolarisResolvedPathWrapper getResolvedReferenceCatalogEntity(
       boolean prependRootContainer) {
+    requirePrimaryResolverStatus();
     // This is a server error instead of being able to legitimately return null, since this means
     // a callsite failed to incorporate a reference catalog into its authorization flow but is
     // still trying to perform operations on the (nonexistence) reference catalog.
@@ -298,6 +307,7 @@ public PolarisResolvedPathWrapper getResolvedReferenceCatalogEntity(
   }
 
   public PolarisEntitySubType getLeafSubType(Object key) {
+    requirePrimaryResolverStatus();
     diagnostics.check(
         pathLookup.containsKey(key),
         "never_registered_key_for_resolved_path",
@@ -320,6 +330,7 @@ public PolarisEntitySubType getLeafSubType(Object key) {
    *     "optional"
    */
   public PolarisResolvedPathWrapper getResolvedPath(Object key, boolean prependRootContainer) {
+    requirePrimaryResolverStatus();
     diagnostics.check(
         pathLookup.containsKey(key),
         "never_registered_key_for_resolved_path",
@@ -384,6 +395,7 @@ public PolarisResolvedPathWrapper getResolvedPath(
 
   public PolarisResolvedPathWrapper getResolvedTopLevelEntity(
       String entityName, PolarisEntityType entityType) {
+    requirePrimaryResolverStatus();
     // For now, all top-level entities will have the root container prepended so we don't have
     // a variation of this method that allows specifying whether to prepend the root container.
     diagnostics.check(

polaris-core/src/test/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifestTest.java

@@ -0,0 +1,55 @@
+/*
+ * 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.core.persistence.resolver;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
+import org.apache.polaris.core.PolarisDiagnostics;
+import org.apache.polaris.core.auth.PolarisPrincipal;
+import org.apache.polaris.core.context.RealmContext;
+import org.apache.polaris.core.entity.PolarisEntityType;
+import org.junit.jupiter.api.Test;
+
+class PolarisResolutionManifestTest {
+
+  @Test
+  void accessingResultsBeforeResolveAllFailsFast() {
+    PolarisDiagnostics diagnostics = new PolarisDefaultDiagServiceImpl();
+    RealmContext realmContext = () -> "test-realm";
+    PolarisPrincipal principal = mock(PolarisPrincipal.class);
+
+    Resolver resolver = mock(Resolver.class);
+    ResolverFactory resolverFactory = mock(ResolverFactory.class);
+    when(resolverFactory.createResolver(principal, "test-catalog")).thenReturn(resolver);
+
+    PolarisResolutionManifest manifest =
+        new PolarisResolutionManifest(
+            diagnostics, realmContext, resolverFactory, principal, "test-catalog");
+
+    assertThrows(NullPointerException.class, () -> manifest.getResolvedPath("key"));
+    assertThrows(NullPointerException.class, () -> manifest.getResolvedReferenceCatalogEntity());
+    assertThrows(NullPointerException.class, () -> manifest.getLeafSubType("key"));
+    assertThrows(
+        NullPointerException.class,
+        () -> manifest.getResolvedTopLevelEntity("catalog", PolarisEntityType.CATALOG));
+  }
+}