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

V2.1 dev

See merge request !8

build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
 	group = 'eu.dariah.de'
-	version = '2.1.3-SNAPSHOT'
+	version = '2.1.4-SNAPSHOT'
 
 	apply plugin: 'eclipse'
 

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/model/ExtendedUserProfile.java

@@ -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

dariahsp-core/src/main/java/eu/dariah/de/dariahsp/model/UserPojo.java → dariahsp-core/src/main/java/eu/dariah/de/dariahsp/model/User.java

@@ -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;