NIFI-11735 Refactored Identity Provider Groups Handling (#7419)

- Removed H2 database approach in favor of passing groups in Application Bearer Token
apache · Jun 22, 2023 · 0f736e0 · 0f736e0
1 parent 9709bd6
commit 0f736e0
Show file tree

Hide file tree

Showing 32 changed files with 114 additions and 1,217 deletions.
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
@@ -50,10 +50,6 @@
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-security-utils</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -78,10 +74,6 @@
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

diff --git a/...ork/nifi-administration/src/main/java/org/apache/nifi/admin/IdpDataSourceFactoryBean.java b/...ork/nifi-administration/src/main/java/org/apache/nifi/admin/IdpDataSourceFactoryBean.java
diff --git a/...ifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/DAOFactory.java b/...ifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/DAOFactory.java
@@ -22,7 +22,4 @@
 public interface DAOFactory {
 
     ActionDAO getActionDAO();
-
-    IdpUserGroupDAO getIdpUserGroupDAO();
-
 }
diff --git a/...work/nifi-administration/src/main/java/org/apache/nifi/admin/dao/DataAccessException.java b/...work/nifi-administration/src/main/java/org/apache/nifi/admin/dao/DataAccessException.java
@@ -32,8 +32,4 @@ public DataAccessException(String message, Throwable cause) {
     public DataAccessException(String message) {
         super(message);
     }
-
-    public DataAccessException() {
-    }
-
 }
diff --git a/...ramework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/IdpUserGroupDAO.java b/...ramework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/IdpUserGroupDAO.java
diff --git a/...work/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/DAOFactoryImpl.java b/...work/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/DAOFactoryImpl.java
@@ -18,7 +18,6 @@
 
 import org.apache.nifi.admin.dao.ActionDAO;
 import org.apache.nifi.admin.dao.DAOFactory;
-import org.apache.nifi.admin.dao.IdpUserGroupDAO;
 
 import java.sql.Connection;
 
@@ -37,9 +36,4 @@ public DAOFactoryImpl(Connection connection) {
     public ActionDAO getActionDAO() {
         return new StandardActionDAO(connection);
     }
-
-    @Override
-    public IdpUserGroupDAO getIdpUserGroupDAO() {
-        return new StandardIdpUserGroupDAO(connection);
-    }
 }