Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] changed Certificate to use Date and not long

This commit is contained in:
Robert von Burg 2015-03-14 21:22:20 +01:00
parent 9870513beb
commit c2f4d7468b
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ch/eitchnet/privilege/handler/DefaultPrivilegeHandler.java
View File

@ -19,6 +19,7 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@ -1002,8 +1003,8 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
String sessionId = nextSessionId();
// create a new certificate, with details of the user
certificate = new Certificate(sessionId, System.currentTimeMillis(), username, user.getFirstname(),
user.getLastname(), authToken, user.getLocale(), userRoles, new HashMap<>(user.getProperties()));
certificate = new Certificate(sessionId, new Date(), username, user.getFirstname(), user.getLastname(),
authToken, user.getLocale(), userRoles, new HashMap<>(user.getProperties()));
PrivilegeContext privilegeContext = buildPrivilegeContext(certificate, user);
this.privilegeContextMap.put(sessionId, privilegeContext);
@ -1554,9 +1555,8 @@ public class DefaultPrivilegeHandler implements PrivilegeHandler {
String sessionId = nextSessionId();
// create a new certificate, with details of the user
Certificate systemUserCertificate = new Certificate(sessionId, System.currentTimeMillis(), systemUsername,
user.getFirstname(), user.getLastname(), authToken, user.getLocale(), user.getRoles(), new HashMap<>(
user.getProperties()));
Certificate systemUserCertificate = new Certificate(sessionId, new Date(), systemUsername, user.getFirstname(),
user.getLastname(), authToken, user.getLocale(), user.getRoles(), new HashMap<>(user.getProperties()));
// create and save a new privilege context
PrivilegeContext privilegeContext = buildPrivilegeContext(systemUserCertificate, user);

13
src/main/java/ch/eitchnet/privilege/model/Certificate.java
View File

@ -17,6 +17,7 @@ package ch.eitchnet.privilege.model;
import java.io.Serializable;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@ -39,7 +40,7 @@ public final class Certificate implements Serializable {
private static final long serialVersionUID = 1L;
private final String sessionId;
private final long loginTime;
private final Date loginTime;
private final String username;
private final String firstname;
private final String lastname;
@ -50,7 +51,7 @@ public final class Certificate implements Serializable {
private final Map<String, String> sessionDataMap;
private Locale locale;
private long lastAccess;
private Date lastAccess;
/**
* Default constructor initializing with all information needed for this certificate
@ -78,7 +79,7 @@ public final class Certificate implements Serializable {
* a {@link Map} containing string value pairs of properties for the logged in user. These properties can
* be edited and can be used for the user to change settings of this session
*/
public Certificate(String sessionId, long loginTime, String username, String firstname, String lastname,
public Certificate(String sessionId, Date loginTime, String username, String firstname, String lastname,
String authToken, Locale locale, Set<String> userRoles, Map<String, String> propertyMap) {
// validate arguments are not null
@ -211,7 +212,7 @@ public final class Certificate implements Serializable {
/**
* @return the loginTime
*/
public long getLoginTime() {
public Date getLoginTime() {
return this.loginTime;
}
@ -227,7 +228,7 @@ public final class Certificate implements Serializable {
/**
* @return the lastAccess
*/
public long getLastAccess() {
public Date getLastAccess() {
return this.lastAccess;
}
@ -235,7 +236,7 @@ public final class Certificate implements Serializable {
* @param lastAccess
* the lastAccess to set
*/
public void setLastAccess(long lastAccess) {
public void setLastAccess(Date lastAccess) {
this.lastAccess = lastAccess;
}