From 07a7c2a7f4d233ff20274badb26d33ba677918cb Mon Sep 17 00:00:00 2001 From: shimingxy Date: Sat, 13 Jun 2020 10:28:59 +0800 Subject: [PATCH] extends --- .../identity/scim/resources/GroupRef.java | 7 ++- .../identity/scim/resources/MemberRef.java | 2 +- .../scim/resources/MultiValuedAttribute.java | 44 +++++++++++++++++++ .../identity/scim/resources/UserAddress.java | 11 ++++- .../identity/scim/resources/UserEmail.java | 44 ++++++++++++++++++- .../scim/resources/UserEntitlement.java | 2 +- .../scim/resources/UserExtension.java | 2 +- .../identity/scim/resources/UserIm.java | 12 ++++- .../scim/resources/UserPhoneNumber.java | 9 ++++ .../identity/scim/resources/UserPhoto.java | 2 +- .../identity/scim/resources/UserRole.java | 2 +- .../scim/resources/UserX509Certificate.java | 2 +- 12 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MultiValuedAttribute.java diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/GroupRef.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/GroupRef.java index 01fb3e820..62504006a 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/GroupRef.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/GroupRef.java @@ -1,5 +1,10 @@ package org.maxkey.identity.scim.resources; -public class GroupRef { +public class GroupRef extends MultiValuedAttribute{ + + /** + * + */ + private static final long serialVersionUID = 7069453283024141999L; } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MemberRef.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MemberRef.java index 7d13c3051..a8c378bb7 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MemberRef.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MemberRef.java @@ -1,5 +1,5 @@ package org.maxkey.identity.scim.resources; -public class MemberRef { +public class MemberRef extends MultiValuedAttribute{ } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MultiValuedAttribute.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MultiValuedAttribute.java new file mode 100644 index 000000000..138fa0d17 --- /dev/null +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/MultiValuedAttribute.java @@ -0,0 +1,44 @@ +package org.maxkey.identity.scim.resources; + +import java.io.Serializable; + +public class MultiValuedAttribute implements Serializable { + private static final long serialVersionUID = 6878912593878245947L; + String value; + String display; + boolean primary; + String reference; + String type; + + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + public String getDisplay() { + return display; + } + public void setDisplay(String display) { + this.display = display; + } + public boolean isPrimary() { + return primary; + } + public void setPrimary(boolean primary) { + this.primary = primary; + } + public String getReference() { + return reference; + } + public void setReference(String reference) { + this.reference = reference; + } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + +} diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserAddress.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserAddress.java index 86fc94fde..c2bf1b369 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserAddress.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserAddress.java @@ -2,7 +2,7 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserAddress implements Serializable { +public class UserAddress extends MultiValuedAttribute implements Serializable { /** * @@ -14,7 +14,14 @@ public class UserAddress implements Serializable { private String region; private String postalCode; private String country; - private String type; + + public static class UserAddressType { + public static final String WORK = "work"; + public static final String HOME = "home"; + public static final String OTHER = "other"; + + } + public String getFormatted() { return formatted; } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEmail.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEmail.java index 6430de759..c7a522768 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEmail.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEmail.java @@ -2,11 +2,53 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserEmail implements Serializable { +public class UserEmail extends MultiValuedAttribute implements Serializable { /** * */ private static final long serialVersionUID = -41327146592552688L; + + public static class UserEmailType { + public static final String WORK = "work"; + public static final String HOME = "home"; + public static final String OTHER = "other"; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public boolean isPrimary() { + return primary; + } + + public void setPrimary(boolean primary) { + this.primary = primary; + } + + public UserEmail() { + } + + public UserEmail(String value, String type, boolean primary) { + super(); + this.value = value; + this.type = type; + this.primary = primary; + } + + } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEntitlement.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEntitlement.java index 0e0865814..217124c59 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEntitlement.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserEntitlement.java @@ -2,7 +2,7 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserEntitlement implements Serializable { +public class UserEntitlement extends MultiValuedAttribute implements Serializable { /** * diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserExtension.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserExtension.java index 37ebc9deb..968242d57 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserExtension.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserExtension.java @@ -2,7 +2,7 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserExtension implements Serializable { +public class UserExtension extends MultiValuedAttribute implements Serializable { /** * diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserIm.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserIm.java index c4862322d..0b2d437c1 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserIm.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserIm.java @@ -2,11 +2,21 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserIm implements Serializable { +public class UserIm extends MultiValuedAttribute implements Serializable { /** * */ private static final long serialVersionUID = -529297556948872883L; + public static class UserImType { + public static final String AIM = "aim"; + public static final String GTALK = "gtalk"; + public static final String ICQ = "icq"; + public static final String XMPP = "xmpp"; + public static final String MSN = "msn"; + public static final String SKYPE = "skype"; + public static final String QQ = "qq"; + public static final String YAHOO = "yahoo"; + } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoneNumber.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoneNumber.java index 7aa561eee..2faa4757d 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoneNumber.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoneNumber.java @@ -9,4 +9,13 @@ public class UserPhoneNumber implements Serializable { */ private static final long serialVersionUID = 3201987266085144715L; + public static class UserPhoneNumberType { + public static final String WORK = "work"; + public static final String HOME = "home"; + public static final String MOBILE = "mobile"; + public static final String FAX = "fax"; + public static final String PAGER = "pager"; + public static final String OTHER = "other"; + + } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoto.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoto.java index 81d3c8fcc..5d3bf5051 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoto.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserPhoto.java @@ -2,7 +2,7 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserPhoto implements Serializable { +public class UserPhoto extends MultiValuedAttribute implements Serializable { /** * diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserRole.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserRole.java index 81d56eea2..44d7231b3 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserRole.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserRole.java @@ -2,7 +2,7 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserRole implements Serializable { +public class UserRole extends MultiValuedAttribute implements Serializable { /** * diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserX509Certificate.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserX509Certificate.java index ba222b42f..c0e211a18 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserX509Certificate.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/UserX509Certificate.java @@ -2,7 +2,7 @@ package org.maxkey.identity.scim.resources; import java.io.Serializable; -public class UserX509Certificate implements Serializable { +public class UserX509Certificate extends MultiValuedAttribute implements Serializable { /** * -- GitLab