Refactor and renamed classes

Author: Joffry Ferrater

abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRoot.java renamed to abac-pep-spring-security/src/main/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpression.java

@@ -15,28 +15,14 @@
 import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.security.access.expression.SecurityExpressionRoot;
-import org.springframework.security.access.expression.method.MethodSecurityExpressionOperations;
-import org.springframework.security.core.Authentication;
 
-public abstract class AbacMethodSecurityExpressionRoot extends SecurityExpressionRoot implements
-    MethodSecurityExpressionOperations {
+public abstract class AbacMethodSecurityExpression {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbacMethodSecurityExpressionRoot.class);
-
-    private Object filterObject;
-    private Object returnObject;
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbacMethodSecurityExpression.class);
 
     private PdpClient pdpClient;
 
-    /**
-     * Creates a new instance
-     *
-     * @param authentication the {@link Authentication} to use. Cannot be null.
-     * @param pdpClient the {@link PdpClient}
-     */
-    public AbacMethodSecurityExpressionRoot(Authentication authentication, PdpClient pdpClient) {
-        super(authentication);
+    public AbacMethodSecurityExpression(PdpClient pdpClient) {
         this.pdpClient = pdpClient;
     }
 
@@ -65,7 +51,6 @@ private Request getAllCategoriesRequest(String attributeId, List<Object> values)
         return request;
     }
 
-
     private boolean isPermitted(Response response) {
         final boolean isPermitted = "Permit".equals(response.getResults().get(0).getDecision());
         LOGGER.debug("isPermitted: {}", isPermitted);
@@ -81,31 +66,6 @@ private ResourceCategory createResourceCategoryRequest(String attributeId, List<
         return resourceCategory;
     }
 
-    @Override
-    public void setFilterObject(Object filterObject) {
-        this.filterObject = filterObject;
-    }
-
-    @Override
-    public Object getFilterObject() {
-        return filterObject;
-    }
-
-    @Override
-    public void setReturnObject(Object returnObject) {
-        this.returnObject = returnObject;
-    }
-
-    @Override
-    public Object getReturnObject() {
-        return returnObject;
-    }
-
-    @Override
-    public Object getThis() {
-        return this;
-    }
-
     protected Optional<List<AccessSubjectCategory>> addAccessSubjectCategoryRequest() {
         return Optional.empty();
     }

abac-pep-spring-security/src/test/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionRootTest.java renamed to abac-pep-spring-security/src/test/java/com/github/joffryferrater/pep/security/AbacMethodSecurityExpressionTest.java

@@ -26,16 +26,16 @@
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = PepApplication.class, initializers  = ConfigFileApplicationContextInitializer.class)
-public class AbacMethodSecurityExpressionRootTest extends TestBase {
+public class AbacMethodSecurityExpressionTest extends TestBase {
 
-    private AbacMethodSecurityExpressionRoot target;
+    private AbacMethodSecurityExpression target;
 
     @Autowired
     PdpClient pdpClient;
 
     @Before
     public void setUp() {
-        target = new AbacMethodSecurityExpressionRoot(new AuthenticationImpl(), pdpClient) {
+        target = new AbacMethodSecurityExpression(pdpClient) {
 
             @Override
             public boolean hasAccessToResource(String attributeId, List<Object> values) {

build.gradle

@@ -7,7 +7,7 @@ allprojects {
     targetCompatibility = 1.8
 
     group = 'com.github.joffryferrater'
-	version = '0.3.1'
+	version = '0.4.1'
 
 	repositories {
         mavenLocal()