Add attributeMapping fields to service provider config

[#149978342] https://www.pivotaltracker.com/story/show/149978342

Signed-off-by: Mikhail Vyshegorodtsev <medvedzver@inbox.ru>

model/src/main/java/org/cloudfoundry/identity/uaa/provider/saml/idp/SamlServiceProviderDefinition.java

@@ -23,6 +23,8 @@
 import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 public class SamlServiceProviderDefinition {
 
@@ -37,13 +39,16 @@ public enum MetadataLocation {
     private int singleSignOnServiceIndex;
     private boolean metadataTrustCheck;
     private boolean skipSslValidation = false;
+    private Map<String, Object> attributeMappings = new HashMap<>();
+
 
     public SamlServiceProviderDefinition clone() {
         return new SamlServiceProviderDefinition(metaDataLocation,
                                                  nameID,
                                                  singleSignOnServiceIndex,
                                                  metadataTrustCheck,
-                                                 skipSslValidation);
+                                                 skipSslValidation,
+                                                 attributeMappings);
     }
 
     public SamlServiceProviderDefinition() {}
@@ -52,12 +57,14 @@ public SamlServiceProviderDefinition(String metaDataLocation,
                                           String nameID,
                                           int singleSignOnServiceIndex,
                                           boolean metadataTrustCheck,
-                                         boolean skipSslValidation) {
+                                         boolean skipSslValidation,
+                                         Map<String, Object> attributeMappings) {
         this.metaDataLocation = metaDataLocation;
         this.nameID = nameID;
         this.singleSignOnServiceIndex = singleSignOnServiceIndex;
         this.metadataTrustCheck = metadataTrustCheck;
         this.skipSslValidation = skipSslValidation;
+        this.attributeMappings = attributeMappings;
     }
 
     @JsonIgnore
@@ -137,12 +144,12 @@ public void setMetadataTrustCheck(boolean metadataTrustCheck) {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((metaDataLocation == null) ? 0 : metaDataLocation.hashCode());
-        result = prime * result + (metadataTrustCheck ? 1231 : 1237);
-        result = prime * result + ((nameID == null) ? 0 : nameID.hashCode());
-        result = prime * result + singleSignOnServiceIndex;
+        int result = metaDataLocation != null ? metaDataLocation.hashCode() : 0;
+        result = 31 * result + (nameID != null ? nameID.hashCode() : 0);
+        result = 31 * result + singleSignOnServiceIndex;
+        result = 31 * result + (metadataTrustCheck ? 1 : 0);
+        result = 31 * result + (skipSslValidation ? 1 : 0);
+        result = 31 * result + (attributeMappings != null ? attributeMappings.hashCode() : 0);
         return result;
     }
 
@@ -154,39 +161,39 @@ public void setSkipSslValidation(boolean skipSslValidation) {
         this.skipSslValidation = skipSslValidation;
     }
 
+    public void setAttributeMappings(Map<String, Object> attributeMappings) {
+        this.attributeMappings = attributeMappings;
+    }
+
+    public Map<String, Object> getAttributeMappings() {
+        return attributeMappings;
+    }
+
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        SamlServiceProviderDefinition other = (SamlServiceProviderDefinition) obj;
-        if (metaDataLocation == null) {
-            if (other.metaDataLocation != null)
-                return false;
-        } else if (!metaDataLocation.equals(other.metaDataLocation))
-            return false;
-        if (metadataTrustCheck != other.metadataTrustCheck)
-            return false;
-        if (nameID == null) {
-            if (other.nameID != null)
-                return false;
-        } else if (!nameID.equals(other.nameID))
-            return false;
-        if (singleSignOnServiceIndex != other.singleSignOnServiceIndex)
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SamlServiceProviderDefinition that = (SamlServiceProviderDefinition) o;
+
+        if (singleSignOnServiceIndex != that.singleSignOnServiceIndex) return false;
+        if (metadataTrustCheck != that.metadataTrustCheck) return false;
+        if (skipSslValidation != that.skipSslValidation) return false;
+        if (metaDataLocation != null ? !metaDataLocation.equals(that.metaDataLocation) : that.metaDataLocation != null)
             return false;
-        return true;
+        if (nameID != null ? !nameID.equals(that.nameID) : that.nameID != null) return false;
+        return attributeMappings != null ? attributeMappings.equals(that.attributeMappings) : that.attributeMappings == null;
     }
 
     @Override
     public String toString() {
         return "SamlServiceProviderDefinition{" +
-            ", metaDataLocation='" + metaDataLocation + '\'' +
+            "metaDataLocation='" + metaDataLocation + '\'' +
             ", nameID='" + nameID + '\'' +
             ", singleSignOnServiceIndex=" + singleSignOnServiceIndex +
             ", metadataTrustCheck=" + metadataTrustCheck +
+            ", skipSslValidation=" + skipSslValidation +
+            ", attributeMappings=" + attributeMappings +
             '}';
     }