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

Merge branch 'v2.1-dev' into 'v2.x-master'

V2.1 dev

See merge request !8
parents 5a1294c2 e29c9a88
Pipeline #18827 passed with stages
in 2 minutes and 28 seconds
...@@ -5,7 +5,7 @@ plugins { ...@@ -5,7 +5,7 @@ plugins {
allprojects { allprojects {
group = 'eu.dariah.de' group = 'eu.dariah.de'
version = '2.1.3-SNAPSHOT' version = '2.1.4-SNAPSHOT'
apply plugin: 'eclipse' apply plugin: 'eclipse'
......
...@@ -48,7 +48,7 @@ public class ExtendedUserProfile extends CommonProfile { ...@@ -48,7 +48,7 @@ public class ExtendedUserProfile extends CommonProfile {
* *
* @param pojo T * @param pojo T
*/ */
public <T extends UserPojo> void fillUserPojo(T pojo) { public <T extends User> void fillUser(T pojo) {
if (pojo==null) { if (pojo==null) {
return; return;
} }
...@@ -59,9 +59,9 @@ public class ExtendedUserProfile extends CommonProfile { ...@@ -59,9 +59,9 @@ public class ExtendedUserProfile extends CommonProfile {
pojo.setExpired(this.isExpired()); pojo.setExpired(this.isExpired());
} }
public UserPojo toUserPojo() { public User toUser() {
UserPojo u = new UserPojo(); User u = new User();
this.fillUserPojo(u); this.fillUser(u);
return u; return u;
} }
} }
\ No newline at end of file
...@@ -9,11 +9,10 @@ import lombok.EqualsAndHashCode; ...@@ -9,11 +9,10 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper=false)
public class UserPojo extends BaseIdentifiable { public class User extends BaseIdentifiable {
private static final long serialVersionUID = -3955895740048975623L; private static final long serialVersionUID = -3955895740048975623L;
private Collection<String> authorities; private Collection<String> authorities;
private String id;
private String issuer; private String issuer;
private String username; private String username;
private boolean expired; 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