[directory-scimple] branch bugFix/attributes-toString updated: Override lombok AttributeReference and AttributeReferenceListWrapper toString() methods

[sm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

smoyer1 pushed a commit to branch bugFix/attributes-toString
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git


The following commit(s) were added to refs/heads/bugFix/attributes-toString by this push:
     new be8c5c6  Override lombok AttributeReference and AttributeReferenceListWrapper toString() methods
     new 58fab5a  Merge branch 'bugFix/attributes-toString' of github.com:apache/directory-scimple into bugFix/attributes-toString
be8c5c6 is described below

commit be8c5c613432e279dd2eaef6510994fb650a87f0
Author: Alex Haskell <ap...@psu.edu>
AuthorDate: Wed Aug 1 10:50:33 2018 -0400

    Override lombok AttributeReference and AttributeReferenceListWrapper toString() methods
    
    Jaxrs uses the lombok generated toString() method when serializing AttributeReferenceListWrapper as a query parameter. This is then parsed incorrectly by the server.
---
 .../directory/scim/spec/protocol/attribute/AttributeReference.java   | 3 +++
 .../scim/spec/protocol/attribute/AttributeReferenceListWrapper.java  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReference.java b/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReference.java
index 83664e3..d941d32 100644
--- a/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReference.java
+++ b/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReference.java
@@ -114,4 +114,7 @@ public class AttributeReference implements Serializable {
     return attributeBase;
   }
 
+  public String toString() {
+    return (this.urn != null ? this.urn + ":" : "") + this.attributeName + (this.subAttributeName != null ? "." + this.subAttributeName : "");
+  }
 }
diff --git a/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReferenceListWrapper.java b/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReferenceListWrapper.java
index 2421dca..38372f6 100644
--- a/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReferenceListWrapper.java
+++ b/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/spec/protocol/attribute/AttributeReferenceListWrapper.java
@@ -21,6 +21,7 @@ package org.apache.directory.scim.spec.protocol.attribute;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -52,4 +53,8 @@ public class AttributeReferenceListWrapper {
     wrapper.attributeReferences = attributeReferences;
     return wrapper;
   }
+
+  public String toString() {
+    return attributeReferences.stream().map(AttributeReference::toString).collect(Collectors.joining(","));
+  }
 }