X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FAbstractUserCondition.java;h=74487bce9e67d56ff894924909d4a7784cb7450c;hb=981d2819a828dad943b0bd4f6df818cfae4ab0df;hp=e6bb53fce2d170e2e2ba828934db198de8f44d16;hpb=ca06b860025bad8d605ea2260164e8a2bb242d2b;p=utils diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java index e6bb53fc..74487bce 100644 --- a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java +++ b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java @@ -25,8 +25,6 @@ import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Version; -import org.wamblee.security.authentication.User; - /** * Condition used to match a user against a specified set of users. * @@ -40,7 +38,7 @@ public abstract class AbstractUserCondition implements UserCondition { @Id @GeneratedValue(strategy = GenerationType.AUTO) - private Long primaryKey; + private Long id; @Version private int version; @@ -50,7 +48,7 @@ public abstract class AbstractUserCondition implements UserCondition { } public AbstractUserCondition(AbstractUserCondition aCondition) { - primaryKey = aCondition.primaryKey; + id = aCondition.id; version = aCondition.version; } }