Merge pull request #5 from mpassid/tietomalli1.4

1.4

Author: JarToi

pom.xml

@@ -30,7 +30,7 @@ THE SOFTWARE.
     </parent>
 
     <groupId>fi.mpass</groupId>
-    <version>1.3</version>
+    <version>1.4</version>
     <packaging>jar</packaging>
     <artifactId>idp-attribute-impl-ecadata</artifactId>
 

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/OpintopolkuOppilaitosDTO.java

@@ -23,6 +23,8 @@
 
 package fi.mpass.shibboleth.attribute.resolver.data;
 
+import java.util.Arrays;
+
 import com.google.gson.annotations.SerializedName;
 
 /**
@@ -44,10 +46,14 @@ public class OpintopolkuOppilaitosDTO {
     /** The code value. */
     @SerializedName("koodiArvo")
     private String codeValue;
+
+    private String oid;
 
     private String parentOid;
 
 	private String parentName;
+
+    private String organizationType;
 
     /**
      * Set the code URI value.
@@ -128,4 +134,29 @@ public String getParentName() {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+
+    public String getOrganizationType() {
+        return organizationType;
+    }
+
+    public void setOrganizationType(String organizationType) {
+        this.organizationType = organizationType;
+    }
+
+    public String getOid() {
+        return oid;
+    }
+
+    public void setOid(String oid) {
+        this.oid = oid;
+    }
+
+    @Override
+    public String toString() {
+        return "OpintopolkuOppilaitosDTO [codeUri=" + codeUri + ", metadata=" + Arrays.toString(metadata) + ", version="
+                + version + ", codeValue=" + codeValue + ", oid=" + oid + ", parentOid=" + parentOid + ", parentName="
+                + parentName + ", organizationType=" + organizationType + "]";
+    }
+
+    
 }

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/OpintopolkuOppilaitosMetadataDTO.java

@@ -88,5 +88,13 @@ public void setLanguage(String newLanguage) {
      */
     public String getLanguage() {
         return language;
-    }        
+    }
+
+    @Override
+    public String toString() {
+        return "OpintopolkuOppilaitosMetadataDTO [name=" + name + ", shortName=" + shortName + ", language=" + language
+                + "]";
+    }  
+    
+    
 }

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/School.java

@@ -10,10 +10,18 @@ public class School {
 	@SerializedName("nimi")
 	private String name;
 
+	private String oid;
+
+	private String officeOid;
+
+	private String officeName;
+
 	private String parentOid;
 
 	private String parentName;
 
+	private String organizationType;
+
 	public School() {};
 
 	public School(String id, String name, String parentOid, String parentName) {
@@ -22,6 +30,26 @@ public School(String id, String name, String parentOid, String parentName) {
 		this.parentOid = parentOid;
 		this.parentName = parentName;
 	}
+
+	public School(String id, String name, String oid, String parentOid, String parentName) {
+		this.id = id;
+		this.oid = oid;
+		this.name = name;
+		this.parentOid = parentOid;
+		this.parentName = parentName;
+	}
+
+	public School(String id, String name, String oid, String officeOid, String officeName, String parentOid,
+			String parentName, String organizationType) {
+		this.id = id;
+		this.name = name;
+		this.oid = oid;
+		this.officeOid = officeOid;
+		this.officeName = officeName;
+		this.parentOid = parentOid;
+		this.parentName = parentName;
+		this.organizationType = organizationType;
+	}
 
 	public String getId() {
 		return id;
@@ -47,4 +75,45 @@ public String getParentName() {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+
+	public String getOid() {
+		return oid;
+	}
+
+	public void setOid(String oid) {
+		this.oid = oid;
+	}
+
+	public String getOfficeOid() {
+		return officeOid;
+	}
+
+	public void setOfficeOid(String officeOid) {
+		this.officeOid = officeOid;
+	}
+
+	public String getOfficeName() {
+		return officeName;
+	}
+
+	public void setOfficeName(String officeName) {
+		this.officeName = officeName;
+	}
+
+	public String getOrganizationType() {
+		return organizationType;
+	}
+
+	public void setOrganizationType(String organizationType) {
+		this.organizationType = organizationType;
+	}
+
+	@Override
+	public String toString() {
+		return "School [id=" + id + ", name=" + name + ", oid=" + oid + ", officeOid=" + officeOid + ", officeName="
+				+ officeName + ", parentOid=" + parentOid + ", parentName=" + parentName + ", organizationType="
+				+ organizationType + "]";
+	}
+
+	
 }

src/main/java/fi/mpass/shibboleth/attribute/resolver/data/UserDTO.java

@@ -54,6 +54,10 @@ public class UserDTO {
 	@SerializedName("last_name")
 	private String lastName;
 
+	/** The nickname of the user. */
+	@SerializedName("nickname")
+	private String nickName;
+
 	/** The array of roles for the user. */
 	private RolesDTO[] roles;
 
@@ -294,6 +298,24 @@ public void setFirstName(String newFirstName) {
 		this.firstName = newFirstName;
 	}
 
+	/**
+	 * Get nick name.
+	 * 
+	 * @return The value of nick_name.
+	 */
+	public String getNickName() {
+		return nickName;
+	}
+
+	/**
+	 * Set nick name.
+	 * 
+	 * @param newNickName The value to be set.
+	 */
+	public void setNickName(String newNickName) {
+		this.nickName = newNickName;
+	}
+
 	/**
 	 * Get last name.
 	 *