Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#5993] refactor: Move the JdbcAuthorizationPlugin to authorization-common module #5994

Merged
merged 2 commits into from
Dec 26, 2024
Merged

[#5993] refactor: Move the JdbcAuthorizationPlugin to authorization-common module #5994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d56986c
[#5993] refacor: Move the JdbcAuthorizationPlugin to authorization-co…
jerqi Dec 25, 2024
2a39df8
address comment
jerqi Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions authorizations/authorization-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
}
implementation(libs.bundles.log4j)
implementation(libs.commons.lang3)
implementation(libs.commons.dbcp2)
implementation(libs.guava)
implementation(libs.javax.jaxb.api) {
exclude("*")
Expand Down
5 changes: 2 additions & 3 deletions ...ization/jdbc/JdbcAuthorizationPlugin.java → ...ation/common/JdbcAuthorizationPlugin.java
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is better moving to authorization/jdbc/ directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
Expand All @@ -40,7 +40,6 @@
import org.apache.gravitino.authorization.RoleChange;
import org.apache.gravitino.authorization.SecurableObject;
import org.apache.gravitino.authorization.User;
import org.apache.gravitino.authorization.common.JdbcAuthorizationProperties;
import org.apache.gravitino.connector.authorization.AuthorizationPlugin;
import org.apache.gravitino.exceptions.AuthorizationPluginException;
import org.apache.gravitino.meta.AuditInfo;
Expand All @@ -55,7 +54,7 @@
* JDBC-based authorization plugins can inherit this class and implement their own SQL statements.
*/
@Unstable
abstract class JdbcAuthorizationPlugin implements AuthorizationPlugin, JdbcAuthorizationSQL {
public abstract class JdbcAuthorizationPlugin implements AuthorizationPlugin, JdbcAuthorizationSQL {

private static final String GROUP_PREFIX = "GRAVITINO_GROUP_";
private static final Logger LOG = LoggerFactory.getLogger(JdbcAuthorizationPlugin.class);
Expand Down
4 changes: 2 additions & 2 deletions ...horization/jdbc/JdbcAuthorizationSQL.java → ...rization/common/JdbcAuthorizationSQL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import java.util.List;
import org.apache.gravitino.MetadataObject;
Expand All @@ -25,7 +25,7 @@

/** Interface for SQL operations of the underlying access control system. */
@Unstable
interface JdbcAuthorizationSQL {
public interface JdbcAuthorizationSQL {

/**
* Get SQL statements for creating a user.
Expand Down
2 changes: 1 addition & 1 deletion ...uthorization/jdbc/JdbcMetadataObject.java → ...horization/common/JdbcMetadataObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import com.google.common.base.Preconditions;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...ino/authorization/jdbc/JdbcPrivilege.java → ...o/authorization/common/JdbcPrivilege.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import org.apache.gravitino.authorization.AuthorizationPrivilege;
import org.apache.gravitino.authorization.Privilege;
Expand Down
2 changes: 1 addition & 1 deletion ...thorization/jdbc/JdbcSecurableObject.java → ...orization/common/JdbcSecurableObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import java.util.List;
import org.apache.gravitino.MetadataObject;
Expand Down
2 changes: 1 addition & 1 deletion ...c/JdbcSecurableObjectMappingProvider.java → ...n/JdbcSecurableObjectMappingProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
Expand Down
5 changes: 2 additions & 3 deletions ...ion/jdbc/JdbcAuthorizationPluginTest.java → ...n/common/TestJdbcAuthorizationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.gravitino.authorization.jdbc;
package org.apache.gravitino.authorization.common;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
Expand All @@ -34,15 +34,14 @@
import org.apache.gravitino.authorization.SecurableObject;
import org.apache.gravitino.authorization.SecurableObjects;
import org.apache.gravitino.authorization.User;
import org.apache.gravitino.authorization.common.JdbcAuthorizationProperties;
import org.apache.gravitino.meta.AuditInfo;
import org.apache.gravitino.meta.GroupEntity;
import org.apache.gravitino.meta.RoleEntity;
import org.apache.gravitino.meta.UserEntity;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class JdbcAuthorizationPluginTest {
public class TestJdbcAuthorizationPlugin {
private static List<String> expectSQLs = Lists.newArrayList();
private static List<MetadataObject.Type> expectTypes = Lists.newArrayList();
private static List<String> expectObjectNames = Lists.newArrayList();
Expand Down
96 changes: 0 additions & 96 deletions authorizations/authorization-jdbc/build.gradle.kts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if (gradle.startParameter.projectProperties["enableFuse"]?.toBoolean() == true)
}
include("iceberg:iceberg-common")
include("iceberg:iceberg-rest-server")
include("authorizations:authorization-ranger", "authorizations:authorization-jdbc", "authorizations:authorization-common", "authorizations:authorization-chain")
include("authorizations:authorization-ranger", "authorizations:authorization-common", "authorizations:authorization-chain")
include("trino-connector:trino-connector", "trino-connector:integration-test")
include("spark-connector:spark-common")
// kyuubi hive connector doesn't support 2.13 for Spark3.3
Expand Down
Loading