This is an automated email from the ASF dual-hosted git repository.
dimas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new a6656c333 Remove CallContextResolver (#2215)
a6656c333 is described below
commit a6656c333a21ee1c435d049ba01081625d66b574
Author: Christopher Lambert <[email protected]>
AuthorDate: Thu Jul 31 16:31:58 2025 +0200
Remove CallContextResolver (#2215)
it seems like these were unused leftovers from previous changes
---
.../service/context/CallContextResolver.java | 29 ---------
.../context/DefaultCallContextResolver.java | 71 ----------------------
2 files changed, 100 deletions(-)
diff --git
a/service/common/src/main/java/org/apache/polaris/service/context/CallContextResolver.java
b/service/common/src/main/java/org/apache/polaris/service/context/CallContextResolver.java
deleted file mode 100644
index 16b8c180c..000000000
---
a/service/common/src/main/java/org/apache/polaris/service/context/CallContextResolver.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.context;
-
-import java.util.Map;
-import org.apache.polaris.core.context.CallContext;
-import org.apache.polaris.core.context.RealmContext;
-
-/** Uses the resolved RealmContext to further resolve elements of the
CallContext. */
-public interface CallContextResolver {
- CallContext resolveCallContext(
- RealmContext realmContext, String method, String path, Map<String,
String> headers);
-}
diff --git
a/service/common/src/main/java/org/apache/polaris/service/context/DefaultCallContextResolver.java
b/service/common/src/main/java/org/apache/polaris/service/context/DefaultCallContextResolver.java
deleted file mode 100644
index f8c95b1ec..000000000
---
a/service/common/src/main/java/org/apache/polaris/service/context/DefaultCallContextResolver.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.context;
-
-import io.smallrye.common.annotation.Identifier;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import java.time.Clock;
-import java.util.Map;
-import org.apache.polaris.core.PolarisCallContext;
-import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.config.PolarisConfigurationStore;
-import org.apache.polaris.core.context.CallContext;
-import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.core.persistence.BasePersistence;
-import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * For local/dev testing, this resolver simply expects a custom bearer-token
format that is a
- * semicolon-separated list of colon-separated key/value pairs that constitute
the realm properties.
- *
- * <p>Example: principal:data-engineer;password:test;realm:acct123
- */
-@ApplicationScoped
-@Identifier("default")
-public class DefaultCallContextResolver implements CallContextResolver {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultCallContextResolver.class);
-
- @Inject MetaStoreManagerFactory metaStoreManagerFactory;
- @Inject PolarisConfigurationStore configurationStore;
- @Inject PolarisDiagnostics diagnostics;
- @Inject Clock clock;
-
- @Override
- public CallContext resolveCallContext(
- final RealmContext realmContext, String method, String path, Map<String,
String> headers) {
- LOGGER
- .atDebug()
- .addKeyValue("realmContext", realmContext.getRealmIdentifier())
- .addKeyValue("method", method)
- .addKeyValue("path", path)
- .addKeyValue("headers", headers)
- .log("Resolving CallContext");
-
- // TODO: Once we have non-transactional-database persistence stores, this
should be
- // pushed down for the metaStoreManagerFactory to inject Transactional-DB
specific things
- // (including the MetaStoreSession" into the PolarisCallContext. The
non-transactional
- // factories would then inject something else instead if needed.
- BasePersistence metaStoreSession =
metaStoreManagerFactory.getOrCreateSession(realmContext);
- return new PolarisCallContext(
- realmContext, metaStoreSession, diagnostics, configurationStore,
clock);
- }
-}
