Remove deprecated checkCanCreateSchema

Retaining the deprecated method was not sufficient for maintaining compatibility, because the new method did not delegate to the old one. Thus, if an implementor kept implementing only the old method, the CREATE SCHEMA would get denied, irrespective of the implemented logic. Removing the deprecated method makes the incompatibility clearer, as it fails at the compilation time.
trinodb · Jan 11, 2023 · 0fac087 · 0fac087
1 parent 1d6a0b4
commit 0fac087
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 83 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/security/InjectedConnectorAccessControl.java b/core/trino-main/src/main/java/io/trino/security/InjectedConnectorAccessControl.java
@@ -14,7 +14,6 @@
 package io.trino.security;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.CatalogSchemaName;
@@ -60,13 +59,6 @@ public void checkCanCreateSchema(ConnectorSecurityContext context, String schema
         accessControl.checkCanCreateSchema(securityContext, getCatalogSchemaName(schemaName), properties);
     }
 
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
-    {
-        checkArgument(context == null, "context must be null");
-        accessControl.checkCanCreateSchema(securityContext, getCatalogSchemaName(schemaName), ImmutableMap.of());
-    }
-
     @Override
     public void checkCanDropSchema(ConnectorSecurityContext context, String schemaName)
     {

diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorAccessControl.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorAccessControl.java
@@ -99,17 +99,6 @@ default void checkCanCreateSchema(ConnectorSecurityContext context, String schem
         denyCreateSchema(schemaName);
     }
 
-    /**
-     * Check if identity is allowed to create the specified schema.
-     *
-     * @throws io.trino.spi.security.AccessDeniedException if not allowed
-     */
-    @Deprecated
-    default void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
-    {
-        denyCreateSchema(schemaName);
-    }
-
     /**
      * Check if identity is allowed to drop the specified schema.
      *

diff --git a/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControl.java b/core/trino-spi/src/main/java/io/trino/spi/security/SystemAccessControl.java
@@ -264,17 +264,6 @@ default void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaNa
         denyCreateSchema(schema.toString());
     }
 
-    /**
-     * Check if identity is allowed to create the specified schema in a catalog.
-     *
-     * @throws AccessDeniedException if not allowed
-     */
-    @Deprecated
-    default void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema)
-    {
-        denyCreateSchema(schema.toString());
-    }
-
     /**
      * Check if identity is allowed to drop the specified schema in a catalog.
      *

diff --git a/...src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorAccessControl.java b/...src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorAccessControl.java
@@ -54,14 +54,6 @@ public void checkCanCreateSchema(ConnectorSecurityContext context, String schema
         }
     }
 
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
-    {
-        try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.checkCanCreateSchema(context, schemaName);
-        }
-    }
-
     @Override
     public void checkCanDropSchema(ConnectorSecurityContext context, String schemaName)
     {

diff --git a/...ino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllAccessControl.java b/...ino-plugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllAccessControl.java
@@ -37,11 +37,6 @@ public void checkCanCreateSchema(ConnectorSecurityContext context, String schema
     {
     }
 
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
-    {
-    }
-
     @Override
     public void checkCanDropSchema(ConnectorSecurityContext context, String schemaName)
     {

diff --git a/...ugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllSystemAccessControl.java b/...ugin-toolkit/src/main/java/io/trino/plugin/base/security/AllowAllSystemAccessControl.java
@@ -141,11 +141,6 @@ public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaNam
     {
     }
 
-    @Override
-    public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema)
-    {
-    }
-
     @Override
     public void checkCanDropSchema(SystemSecurityContext context, CatalogSchemaName schema)
     {

diff --git a/...no-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControl.java b/...no-plugin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedAccessControl.java
@@ -139,12 +139,6 @@ public FileBasedAccessControl(CatalogName catalogName, AccessControlRules rules)
 
     @Override
     public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName, Map<String, Object> properties)
-    {
-        checkCanCreateSchema(context, schemaName);
-    }
-
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
     {
         if (!isSchemaOwner(context, schemaName)) {
             denyCreateSchema(schemaName);

diff --git a/...gin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControl.java b/...gin-toolkit/src/main/java/io/trino/plugin/base/security/FileBasedSystemAccessControl.java
@@ -385,12 +385,6 @@ public Set<String> filterCatalogs(SystemSecurityContext context, Set<String> cat
 
     @Override
     public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema, Map<String, Object> properties)
-    {
-        checkCanCreateSchema(context, schema);
-    }
-
-    @Override
-    public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema)
     {
         if (!isSchemaOwner(context, schema)) {
             denyCreateSchema(schema.toString());

diff --git a/...toolkit/src/main/java/io/trino/plugin/base/security/ForwardingConnectorAccessControl.java b/...toolkit/src/main/java/io/trino/plugin/base/security/ForwardingConnectorAccessControl.java
@@ -55,12 +55,6 @@ public void checkCanCreateSchema(ConnectorSecurityContext context, String schema
         delegate().checkCanCreateSchema(context, schemaName, properties);
     }
 
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
-    {
-        delegate().checkCanCreateSchema(context, schemaName);
-    }
-
     @Override
     public void checkCanDropSchema(ConnectorSecurityContext context, String schemaName)
     {

diff --git a/...in-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingSystemAccessControl.java b/...in-toolkit/src/main/java/io/trino/plugin/base/security/ForwardingSystemAccessControl.java
@@ -145,12 +145,6 @@ public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaNam
         delegate().checkCanCreateSchema(context, schema, properties);
     }
 
-    @Override
-    public void checkCanCreateSchema(SystemSecurityContext context, CatalogSchemaName schema)
-    {
-        delegate().checkCanCreateSchema(context, schema);
-    }
-
     @Override
     public void checkCanDropSchema(SystemSecurityContext context, CatalogSchemaName schema)
     {

diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/LegacyAccessControl.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/LegacyAccessControl.java
@@ -75,11 +75,6 @@ public void checkCanCreateSchema(ConnectorSecurityContext context, String schema
     {
     }
 
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
-    {
-    }
-
     @Override
     public void checkCanDropSchema(ConnectorSecurityContext context, String schemaName)
     {

diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SqlStandardAccessControl.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/security/SqlStandardAccessControl.java
@@ -131,12 +131,6 @@ public SqlStandardAccessControl(
 
     @Override
     public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName, Map<String, Object> properties)
-    {
-        checkCanCreateSchema(context, schemaName);
-    }
-
-    @Override
-    public void checkCanCreateSchema(ConnectorSecurityContext context, String schemaName)
     {
         if (!isAdmin(context)) {
             denyCreateSchema(schemaName);