Skip to content

Commit 2b09b7f

Browse files
committed
Add Attribute Consumer Services tests to SettingsBuilderTest
1 parent 0b676c3 commit 2b09b7f

File tree

2 files changed

+269
-7
lines changed

2 files changed

+269
-7
lines changed

core/src/main/java/com/onelogin/saml2/model/AttributeConsumingService.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public AttributeConsumingService(int index, Boolean isDefault, String serviceNam
5757
this.index = index;
5858
this.isDefault = isDefault;
5959
this.serviceName = serviceName != null? serviceName : "";
60-
this.serviceDescription = serviceDescription != null? serviceDescription : "";
60+
this.serviceDescription = serviceDescription;
6161
this.lang = lang != null? lang: "en";
6262
this.requestedAttributes = new ArrayList<RequestedAttribute>();
6363
}
@@ -79,18 +79,21 @@ public AttributeConsumingService(int index, Boolean isDefault, String serviceNam
7979
}
8080

8181
/**
82-
* Constructor for a non-default attribute consuming service with index <code>1</code>
83-
* and service name and descriptions in English.
84-
* Mainly kept for backward compatibility, this constructor can be used when an only
85-
* attribute consuming service is required.
82+
* Constructor for a non-default attribute consuming service with index
83+
* <code>1</code> and service name and descriptions in English.
84+
* <p>
85+
* Mainly kept for backward compatibility, this constructor can be used when an
86+
* only attribute consuming service is required. Please also note that, to
87+
* maintain full backward compatibility, if the service description is
88+
* <code>null</code> this constructor will set is as an empty string.
8689
*
8790
* @param serviceName
8891
* String. Service Name
8992
* @param serviceDescription
90-
* String. Service Description
93+
* String. Service Description; if <code>null</code>, an empty string will be set
9194
*/
9295
public AttributeConsumingService(String serviceName, String serviceDescription) {
93-
this(1, null, serviceName, serviceDescription, null);
96+
this(1, null, serviceName, serviceDescription != null? serviceDescription : "", null);
9497
}
9598

9699
/**

0 commit comments

Comments
 (0)