From 64721a895973f935c1adb975247770f402a88fdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 25 Apr 2016 15:10:24 +0000
Subject: [PATCH] ACI UCDetector and AutoRefactor code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
index 84011af..b0b6c12 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
@@ -12,24 +12,20 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.authorization.dseecompat;
import static org.opends.messages.AccessControlMessages.*;
-import java.util.HashSet;
import java.util.Set;
-/**
- * This class represents an ACI's targetcontrol keyword.
- */
+/** This class represents an ACI's targetcontrol keyword. */
public class TargetControl {
-
/** HashSet of OID strings parsed from the decode. */
- private Set<String> controlOIDS = new HashSet<>();
+ private final Set<String> controlOIDS;
/** Enumeration representing the targetcontrol operator. */
- private EnumTargetOperator op = EnumTargetOperator.EQUALITY;
+ private final EnumTargetOperator op;
/**
* Creates a class that can be used to evaluate a targetcontrol.
@@ -73,18 +69,23 @@
{
return false;
}
- boolean ret = false;
- for(String oid : controlOIDS)
+ boolean ret = isApplicable(matchCtx.getControlOID());
+ if (EnumTargetOperator.NOT_EQUALITY.equals(op))
{
- if(oid.equals("*") || matchCtx.getControlOID().equals(oid)) {
- ret=true;
- break;
- }
- }
- if(op.equals(EnumTargetOperator.NOT_EQUALITY))
- {
- ret = !ret;
+ return !ret;
}
return ret;
}
+
+ private boolean isApplicable(String matchControlOID)
+ {
+ for (String oid : controlOIDS)
+ {
+ if (oid.equals("*") || matchControlOID.equals(oid))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.10.0