Merge pull request #179 from xenit-eu/package-private-abac-context

Make AbacContext package-private to avoid misuse to retrieve the ABAC Context
xenit-eu · Jun 28, 2024 · ce8a797 · ce8a797
2 parents 7948656 + a705240
commit ce8a797
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/...c/main/java/com/contentgrid/thunx/spring/data/querydsl/AbacQuerydslPredicateResolver.java b/...c/main/java/com/contentgrid/thunx/spring/data/querydsl/AbacQuerydslPredicateResolver.java
@@ -2,7 +2,6 @@
 
 import com.contentgrid.thunx.predicates.querydsl.FieldByReflectionAccessStrategy;
 import com.contentgrid.thunx.predicates.querydsl.QueryDslConverter;
-import com.contentgrid.thunx.spring.data.context.AbacContext;
 import com.contentgrid.thunx.spring.data.context.AbacContextSupplier;
 import com.contentgrid.thunx.spring.data.querydsl.predicate.injector.resolver.OperationPredicates;
 import com.contentgrid.thunx.spring.data.querydsl.predicate.injector.resolver.QuerydslPredicateResolver;
@@ -15,7 +14,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Resolves the QueryDSL Predicate from the Thunx {@link AbacContext} that is sent with the request
+ * Resolves the QueryDSL Predicate from the Thunx {@link AbacContextSupplier}
  */
 @Slf4j
 public class AbacQuerydslPredicateResolver implements QuerydslPredicateResolver {

diff --git a/...hunx/spring/data/context/AbacContext.java → ...d/thunx/spring/data/rest/AbacContext.java b/...hunx/spring/data/context/AbacContext.java → ...d/thunx/spring/data/rest/AbacContext.java
@@ -1,8 +1,8 @@
-package com.contentgrid.thunx.spring.data.context;
+package com.contentgrid.thunx.spring.data.rest;
 
 import com.contentgrid.thunx.predicates.model.ThunkExpression;
 
-public class AbacContext {
+class AbacContext {
 
     private static ThreadLocal<ThunkExpression<Boolean>> currentAbacContext = new InheritableThreadLocal<ThunkExpression<Boolean>>();
 

diff --git a/thunx-spring-api/src/main/java/com/contentgrid/thunx/spring/data/rest/AbacRequestFilter.java b/thunx-spring-api/src/main/java/com/contentgrid/thunx/spring/data/rest/AbacRequestFilter.java
@@ -1,6 +1,5 @@
 package com.contentgrid.thunx.spring.data.rest;
 
-import com.contentgrid.thunx.spring.data.context.AbacContext;
 import com.contentgrid.thunx.encoding.ThunkExpressionDecoder;
 import com.contentgrid.thunx.predicates.model.ThunkExpression;
 import java.io.IOException;

diff --git a/...api/src/main/java/com/contentgrid/thunx/spring/data/rest/HttpHeaderAbacConfiguration.java b/...api/src/main/java/com/contentgrid/thunx/spring/data/rest/HttpHeaderAbacConfiguration.java
@@ -1,7 +1,6 @@
 package com.contentgrid.thunx.spring.data.rest;
 
 import com.contentgrid.thunx.encoding.ThunkExpressionDecoder;
-import com.contentgrid.thunx.spring.data.context.AbacContext;
 import com.contentgrid.thunx.spring.data.context.AbacContextSupplier;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;