Commit e29c9a88 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

18: Adapt according to needs of first actual implementation (CR)

Task-Url: #18
parent 0e20f1e8
Pipeline #18619 passed with stage
in 30 seconds
......@@ -5,7 +5,7 @@ plugins {
allprojects {
group = 'eu.dariah.de'
version = '2.1.3-SNAPSHOT'
version = '2.1.4-SNAPSHOT'
apply plugin: 'eclipse'
......
......@@ -48,7 +48,7 @@ public class ExtendedUserProfile extends CommonProfile {
*
* @param pojo T
*/
public <T extends UserPojo> void fillUserPojo(T pojo) {
public <T extends User> void fillUser(T pojo) {
if (pojo==null) {
return;
}
......@@ -59,9 +59,9 @@ public class ExtendedUserProfile extends CommonProfile {
pojo.setExpired(this.isExpired());
}
public UserPojo toUserPojo() {
UserPojo u = new UserPojo();
this.fillUserPojo(u);
public User toUser() {
User u = new User();
this.fillUser(u);
return u;
}
}
\ No newline at end of file
......@@ -9,11 +9,10 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper=false)
public class UserPojo extends BaseIdentifiable {
public class User extends BaseIdentifiable {
private static final long serialVersionUID = -3955895740048975623L;
private Collection<String> authorities;
private String id;
private String issuer;
private String username;
private boolean expired;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment