git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
security
/
authorization
/
AbstractUserCondition.java
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 e6bb53fce2d170e2e2ba828934db198de8f44d16..74487bce9e67d56ff894924909d4a7784cb7450c 100644
(file)
--- 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 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.
*
/**
* 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)
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- private Long
primaryKey
;
+ private Long
id
;
@Version
private int version;
@Version
private int version;
@@
-50,7
+48,7
@@
public abstract class AbstractUserCondition implements UserCondition {
}
public AbstractUserCondition(AbstractUserCondition aCondition) {
}
public AbstractUserCondition(AbstractUserCondition aCondition) {
-
primaryKey = aCondition.primaryKey
;
+
id = aCondition.id
;
version = aCondition.version;
}
}
version = aCondition.version;
}
}