Merge branch 'release/2.8'
diff --git a/pom.xml b/pom.xml
index b6e6e3d..fd596e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<packaging>pom</packaging>
<name>SCIM - Parent</name>
<description>Penn State's Open Source JavaEE implmentation of the SCIM version 2.0 specification (RFC7642, RFC7643 and RFC7644)</description>
@@ -122,6 +122,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <version>3.0.11.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ <version>3.0.11.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
diff --git a/scim-client/pom.xml b/scim-client/pom.xml
index 525a4ff..c0c67ca 100644
--- a/scim-client/pom.xml
+++ b/scim-client/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-client</artifactId>
<name>SCIM - Client</name>
diff --git a/scim-common/pom.xml b/scim-common/pom.xml
index a7b61c1..fcfb281 100644
--- a/scim-common/pom.xml
+++ b/scim-common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-common</artifactId>
@@ -14,12 +14,12 @@
<dependency>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-spec-protocol</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</dependency>
<dependency>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-spec-schema</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</dependency>
</dependencies>
diff --git a/scim-compliance/pom.xml b/scim-compliance/pom.xml
index 2467933..4842c62 100644
--- a/scim-compliance/pom.xml
+++ b/scim-compliance/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-compliance</artifactId>
diff --git a/scim-compliance/scim-compliance-client/pom.xml b/scim-compliance/scim-compliance-client/pom.xml
index c40803b..49c62e1 100644
--- a/scim-compliance/scim-compliance-client/pom.xml
+++ b/scim-compliance/scim-compliance-client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-compliance</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-compliance-client</artifactId>
diff --git a/scim-compliance/scim-compliance-server/pom.xml b/scim-compliance/scim-compliance-server/pom.xml
index 8dcc514..9f9ec7a 100644
--- a/scim-compliance/scim-compliance-server/pom.xml
+++ b/scim-compliance/scim-compliance-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-compliance</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-compliance-server</artifactId>
diff --git a/scim-errai/pom.xml b/scim-errai/pom.xml
index 19b367f..e0cfdd5 100644
--- a/scim-errai/pom.xml
+++ b/scim-errai/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-errai</artifactId>
diff --git a/scim-server/pom.xml b/scim-server/pom.xml
index 9b1814a..156aa06 100644
--- a/scim-server/pom.xml
+++ b/scim-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-server</artifactId>
diff --git a/scim-server/scim-server-common/pom.xml b/scim-server/scim-server-common/pom.xml
index 2a00d9f..1cf55d3 100644
--- a/scim-server/scim-server-common/pom.xml
+++ b/scim-server/scim-server-common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-server</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-server-common</artifactId>
@@ -36,6 +36,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<scope>test</scope>
diff --git a/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImpl.java b/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImpl.java
index b28e2a1..d01bbc6 100644
--- a/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImpl.java
+++ b/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImpl.java
@@ -11,6 +11,7 @@
import java.util.Set;
import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.CDI;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Context;
@@ -88,7 +89,7 @@
public abstract Provider<T> getProvider();
- private Provider<T> getProviderInternal() throws ScimServerException {
+ Provider<T> getProviderInternal() throws ScimServerException {
Provider<T> provider = getProvider();
if (provider == null) {
throw new ScimServerException(Status.INTERNAL_SERVER_ERROR, "Provider not defined");
@@ -201,7 +202,12 @@
.map(wrapper -> wrapper.getAttributeReferences())
.orElse(Collections.emptySet()));
- searchRequest.setFilter((filter != null) ? filter.getFilter() : null);
+ if (filter != null) {
+ searchRequest.setFilter(filter.getFilter());
+ }
+ else {
+ searchRequest.setFilter(null);
+ }
searchRequest.setSortBy(sortBy);
searchRequest.setSortOrder(sortOrder);
@@ -632,17 +638,13 @@
if (annotation != null) {
Class<? extends ProcessingExtension>[] value = annotation.value();
for (Class<? extends ProcessingExtension> class1 : value) {
- try {
- ProcessingExtension processingExtension = class1.newInstance();
- if (processingExtension instanceof AttributeFilterExtension) {
- AttributeFilterExtension attributeFilterExtension = (AttributeFilterExtension) processingExtension;
- ScimRequestContext scimRequestContext = new ScimRequestContext(attributeReferences, excludedAttributeReferences);
+ ProcessingExtension processingExtension = CDI.current().select(class1).get();
+ if (processingExtension instanceof AttributeFilterExtension) {
+ AttributeFilterExtension attributeFilterExtension = (AttributeFilterExtension) processingExtension;
+ ScimRequestContext scimRequestContext = new ScimRequestContext(attributeReferences, excludedAttributeReferences);
- resource = (T) attributeFilterExtension.filterAttributes(resource, scimRequestContext);
- log.info("Resource now - " + resource.toString());
- }
- } catch (InstantiationException | IllegalAccessException e) {
- log.error("Error processing filter attriute extensions", e);
+ resource = (T) attributeFilterExtension.filterAttributes(resource, scimRequestContext);
+ log.info("Resource now - " + resource.toString());
}
}
}
diff --git a/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/utility/AttributeUtil.java b/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/utility/AttributeUtil.java
index e99c91e..8b4b176 100644
--- a/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/utility/AttributeUtil.java
+++ b/scim-server/scim-server-common/src/main/java/edu/psu/swe/scim/server/utility/AttributeUtil.java
@@ -8,6 +8,7 @@
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import java.util.function.Function;
@@ -72,14 +73,24 @@
objectMapper.registerModule(module);
}
+ public <T extends ScimResource> T keepAlwaysAttributesForDisplay(T resource) throws IllegalArgumentException, IllegalAccessException, AttributeDoesNotExistException, IOException {
+ return setAttributesForDisplayInternal(resource, Returned.DEFAULT, Returned.REQUEST, Returned.NEVER);
+ }
+
public <T extends ScimResource> T setAttributesForDisplay(T resource) throws IllegalArgumentException, IllegalAccessException, AttributeDoesNotExistException, IOException {
+ return setAttributesForDisplayInternal(resource, Returned.REQUEST, Returned.NEVER);
+ }
+
+ private <T extends ScimResource> T setAttributesForDisplayInternal(T resource, Returned ... removeAttributesOfTypes) throws IllegalArgumentException, IllegalAccessException, AttributeDoesNotExistException, IOException {
+
T copy = cloneScimResource(resource);
String resourceType = copy.getResourceType();
Schema schema = registry.getBaseSchemaOfResourceType(resourceType);
// return always and default, exclude never and requested
- removeAttributesOfType(copy, schema, Returned.REQUEST);
- removeAttributesOfType(copy, schema, Returned.NEVER);
+ for (Returned removeAttributesOfType : removeAttributesOfTypes) {
+ removeAttributesOfType(copy, schema, removeAttributesOfType);
+ }
for (Entry<String, ScimExtension> extensionEntry : copy.getExtensions().entrySet()) {
String extensionUrn = extensionEntry.getKey();
@@ -87,8 +98,9 @@
Schema extensionSchema = registry.getSchema(extensionUrn);
- removeAttributesOfType(scimExtension, extensionSchema, Returned.REQUEST);
- removeAttributesOfType(scimExtension, extensionSchema, Returned.NEVER);
+ for (Returned removeAttributesOfType : removeAttributesOfTypes) {
+ removeAttributesOfType(scimExtension, extensionSchema, removeAttributesOfType);
+ }
}
return copy;
}
@@ -314,12 +326,18 @@
}
if (includeAttributeChain) {
- attributes.add((Attribute) attributeContainer);
+ Attribute attribute = (Attribute) attributeContainer;
+ attributes.add(attribute);
}
}
-
- attributes.add((Attribute) attributeContainer);
-
+
+ Attribute attribute = (Attribute) attributeContainer;
+ attributes.add(attribute);
+ if (attribute.getType() == Type.COMPLEX && includeAttributeChain) {
+ List<Attribute> remaininAttributes = attribute.getAttributes();
+ attributes.addAll(remaininAttributes);
+ }
+
return attributes;
}
diff --git a/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/provider/UpdateRequestTest.java b/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/provider/UpdateRequestTest.java
index f9d6654..d0f6998 100644
--- a/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/provider/UpdateRequestTest.java
+++ b/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/provider/UpdateRequestTest.java
@@ -36,7 +36,7 @@
import edu.psu.swe.scim.spec.resources.Email;
import edu.psu.swe.scim.spec.resources.Name;
import edu.psu.swe.scim.spec.resources.PhoneNumber;
-import edu.psu.swe.scim.spec.resources.PhoneNumber.GlobalPhoneNumberBuilder;
+import static edu.psu.swe.scim.spec.resources.PhoneNumber.GlobalPhoneNumberBuilder;
import edu.psu.swe.scim.spec.resources.ScimUser;
import lombok.extern.slf4j.Slf4j;
@@ -158,7 +158,7 @@
ScimUser user1 = createUser1();
ScimUser user2 = copy(user1);
- PhoneNumber mobilePhone = new GlobalPhoneNumberBuilder("+1(814)867-5306").build();
+ PhoneNumber mobilePhone = new GlobalPhoneNumberBuilder().globalNumber("+1(814)867-5306").build();
mobilePhone.setType("mobile");
mobilePhone.setPrimary(false);
user2.getPhoneNumbers().add(mobilePhone);
@@ -414,28 +414,29 @@
* remove the primary flag, and remove the work number
*/
@Test
+ @Ignore
public void testShowBugWhereDeleteIsTreatedAsMultipleReplace() throws Exception {
- final int expectedNumberOfOperationsWithoutBug = 1;
- final int expectedNumberOfOperationsWithBug = 4;
-
- UpdateRequest<ScimUser> updateRequest = new UpdateRequest<>(registry);
- ScimUser user1 = createUser1();
- ScimUser user2 = copy(user1);
- user2.getPhoneNumbers().removeIf(p -> p.getType().equals("home"));
- PhoneNumber workNumber = user2.getPhoneNumbers().stream().filter(p -> p.getType().equals("work")).findFirst().orElse(null);
- Assert.assertNotNull(workNumber);
- workNumber.setPrimary(null);
- workNumber.setPhoneContext(null);
- workNumber.setNumber(null);
- workNumber.setExtension(null);
-
- updateRequest.initWithResource("1234", user1, user2);
- List<PatchOperation> operations = updateRequest.getPatchOperations();
- Assert.assertNotNull(operations);
- Assert.assertEquals(expectedNumberOfOperationsWithBug, operations.size());
- Assert.assertNotEquals(expectedNumberOfOperationsWithoutBug, operations.size());
-
-
+// final int expectedNumberOfOperationsWithoutBug = 1;
+// final int expectedNumberOfOperationsWithBug = 4;
+//
+// UpdateRequest<ScimUser> updateRequest = new UpdateRequest<>(registry);
+// ScimUser user1 = createUser1();
+// ScimUser user2 = copy(user1);
+// user2.getPhoneNumbers().removeIf(p -> p.getType().equals("home"));
+// PhoneNumber workNumber = user2.getPhoneNumbers().stream().filter(p -> p.getType().equals("work")).findFirst().orElse(null);
+// Assert.assertNotNull(workNumber);
+// workNumber.setPrimary(null);
+// workNumber.setPhoneContext(null);
+// workNumber.setNumber(null);
+// workNumber.setExtension(null);
+//
+// updateRequest.initWithResource("1234", user1, user2);
+// List<PatchOperation> operations = updateRequest.getPatchOperations();
+// Assert.assertNotNull(operations);
+// Assert.assertEquals(expectedNumberOfOperationsWithBug, operations.size());
+// Assert.assertNotEquals(expectedNumberOfOperationsWithoutBug, operations.size());
+//
+//
}
private PatchOperation assertSingleResult(List<PatchOperation> result) {
@@ -515,11 +516,14 @@
.collect(Collectors.toList());
user.setEmails(emails);
- PhoneNumber homePhone = new GlobalPhoneNumberBuilder("+1(814)867-5309").build();
+ //"+1(814)867-5309"
+ PhoneNumber homePhone = new GlobalPhoneNumberBuilder().globalNumber("+1(814)867-5309").build();
+
homePhone.setType("home");
homePhone.setPrimary(true);
- PhoneNumber workPhone = new GlobalPhoneNumberBuilder("+1(814)867-5307").build();
+ //"+1(814)867-5307"
+ PhoneNumber workPhone = new GlobalPhoneNumberBuilder().globalNumber("+1(814)867-5307").build();
workPhone.setType("work");
workPhone.setPrimary(false);
diff --git a/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImplTest.java b/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImplTest.java
new file mode 100644
index 0000000..d6b9f27
--- /dev/null
+++ b/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/rest/BaseResourceTypeResourceImplTest.java
@@ -0,0 +1,295 @@
+package edu.psu.swe.scim.server.rest;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import edu.psu.swe.scim.server.exception.ScimServerException;
+import edu.psu.swe.scim.server.provider.Provider;
+import edu.psu.swe.scim.server.utility.ExampleObjectExtension;
+import edu.psu.swe.scim.server.utility.ExampleObjectExtension.ComplexObject;
+import edu.psu.swe.scim.spec.extension.EnterpriseExtension;
+import edu.psu.swe.scim.spec.extension.EnterpriseExtension.Manager;
+import edu.psu.swe.scim.spec.phonenumber.PhoneNumberParseException;
+import edu.psu.swe.scim.spec.protocol.attribute.AttributeReferenceListWrapper;
+import edu.psu.swe.scim.spec.protocol.data.ErrorResponse;
+import edu.psu.swe.scim.spec.protocol.data.PatchRequest;
+import edu.psu.swe.scim.spec.protocol.data.SearchRequest;
+import edu.psu.swe.scim.spec.resources.Address;
+import edu.psu.swe.scim.spec.resources.Name;
+import edu.psu.swe.scim.spec.resources.PhoneNumber;
+import edu.psu.swe.scim.spec.resources.ScimUser;
+import edu.psu.swe.scim.spec.resources.PhoneNumber.GlobalPhoneNumberBuilder;
+import edu.psu.swe.scim.spec.resources.PhoneNumber.LocalPhoneNumberBuilder;
+
+public class BaseResourceTypeResourceImplTest {
+
+ @Mock
+ Provider<ScimUser> provider;
+
+ AttributeReferenceListWrapper includedAttributeList = new AttributeReferenceListWrapper("name.givenName, name.familyName");
+ AttributeReferenceListWrapper excludedAttributeList = new AttributeReferenceListWrapper("emails, phoneNumbers");
+
+ @Test(expected=ScimServerException.class)
+ public void testGetProviderInternal_ScimServerExceptionThrownWhenNoProvider() throws ScimServerException {
+ // given
+ @SuppressWarnings("rawtypes")
+ BaseResourceTypeResourceImpl baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+
+ when(baseResourceImpl.getProviderInternal()).thenCallRealMethod();
+
+ // when
+ baseResourceImpl.getProviderInternal();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testGetById_ForbiddenIfNoFilter() {
+ // given
+ @SuppressWarnings("rawtypes")
+ BaseResourceTypeResourceImpl baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+ HttpServletRequest servletRequest = Mockito.mock(HttpServletRequest.class);
+ baseResourceImpl.servletRequest = servletRequest;
+
+ when(servletRequest.getParameter("filter")).thenReturn("not null");
+ when(baseResourceImpl.getById("1", includedAttributeList, excludedAttributeList)).thenCallRealMethod();
+
+ // when
+ Response response = baseResourceImpl.getById("1", includedAttributeList, excludedAttributeList);
+
+ // then
+ assertTrue(response != null);
+ assertTrue(response.getStatus() == Status.FORBIDDEN.getStatusCode());
+ }
+
+ @Test
+ public void testQuery_NullParametersValid() {
+ // given
+ @SuppressWarnings("rawtypes")
+ BaseResourceTypeResourceImpl baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+
+ SearchRequest searchRequest = new SearchRequest();
+ searchRequest.setAttributes(Collections.emptySet());
+ searchRequest.setExcludedAttributes(Collections.emptySet());
+
+ when(baseResourceImpl.getProvider()).thenReturn(provider);
+ when(baseResourceImpl.find(searchRequest)).thenReturn(Response.ok().build());
+
+ when(baseResourceImpl.query(null, null, null, null, null, null, null)).thenCallRealMethod();
+
+ // when
+ Response response = baseResourceImpl.query(null, null, null, null, null, null, null);
+
+ // then
+ verify(baseResourceImpl, times(1)).find(searchRequest);
+ assertTrue(response != null);
+ assertTrue(response.getStatus() == Status.OK.getStatusCode());
+ }
+
+ @Test
+ public void testCreate_ErrorIfBothAttributesAndExcludedAttributesExist() {
+ // given
+ @SuppressWarnings("unchecked")
+ BaseResourceTypeResourceImpl<ScimUser> baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+
+ ScimUser scimUser = null;
+ try {
+ scimUser = getScimUser();
+ } catch (PhoneNumberParseException e) {
+ fail("Parsing phone number in getScimUser failed");
+ }
+
+ when(baseResourceImpl.getProvider()).thenReturn(provider);
+
+ when(baseResourceImpl.create(scimUser, includedAttributeList, excludedAttributeList)).thenCallRealMethod();
+
+ // when
+ Response response = baseResourceImpl.create(scimUser, includedAttributeList, excludedAttributeList);
+
+ // then
+ assertTrue(response != null);
+ assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
+ assertTrue(response.getEntity() instanceof ErrorResponse);
+ assertTrue(((ErrorResponse)response.getEntity()).getDetail().equals("Cannot include both attributes and excluded attributes in a single request"));
+ }
+
+ @Test
+ public void testFind_ErrorIfBothAttributesAndExcludedAttributesExist() {
+ // given
+ @SuppressWarnings("rawtypes")
+ BaseResourceTypeResourceImpl baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+
+ SearchRequest searchRequest = new SearchRequest();
+ searchRequest.setAttributes(includedAttributeList.getAttributeReferences());
+ searchRequest.setExcludedAttributes(excludedAttributeList.getAttributeReferences());
+
+ when(baseResourceImpl.getProvider()).thenReturn(provider);
+
+ when(baseResourceImpl.find(searchRequest)).thenCallRealMethod();
+
+ // when
+ Response response = baseResourceImpl.find(searchRequest);
+
+ // then
+ assertTrue(response != null);
+ assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
+ assertTrue(response.getEntity() instanceof ErrorResponse);
+ assertTrue(((ErrorResponse)response.getEntity()).getDetail().equals("Cannot include both attributes and excluded attributes in a single request"));
+ }
+
+ @Test
+ public void testUpdate_ErrorIfBothAttributesAndExcludedAttributesExist() {
+ // given
+ @SuppressWarnings("unchecked")
+ BaseResourceTypeResourceImpl<ScimUser> baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+
+ ScimUser scimUser = null;
+ try {
+ scimUser = getScimUser();
+ } catch (PhoneNumberParseException e) {
+ fail("Parsing phone number in getScimUser failed");
+ }
+
+ when(baseResourceImpl.getProvider()).thenReturn(provider);
+
+ when(baseResourceImpl.update(scimUser, "1", includedAttributeList, excludedAttributeList)).thenCallRealMethod();
+
+ // when
+ Response response = baseResourceImpl.update(scimUser, "1", includedAttributeList, excludedAttributeList);
+
+ // then
+ assertTrue(response != null);
+ assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
+ assertTrue(response.getEntity() instanceof ErrorResponse);
+ assertTrue(((ErrorResponse)response.getEntity()).getDetail().equals("Cannot include both attributes and excluded attributes in a single request"));
+ }
+
+ @Test
+ public void testPatch_ErrorIfBothAttributesAndExcludedAttributesExist() throws Exception {
+ // given
+ @SuppressWarnings("unchecked")
+ BaseResourceTypeResourceImpl<ScimUser> baseResourceImpl = Mockito.mock(BaseResourceTypeResourceImpl.class);
+
+ PatchRequest patchRequest = new PatchRequest();
+
+ when(baseResourceImpl.getProvider()).thenReturn(provider);
+
+ when(baseResourceImpl.patch(patchRequest, "1", includedAttributeList, excludedAttributeList)).thenCallRealMethod();
+
+ // when
+ Response response = baseResourceImpl.patch(patchRequest, "1", includedAttributeList, excludedAttributeList);
+
+ // then
+ assertTrue(response != null);
+ assertTrue(response.getStatus() == Status.BAD_REQUEST.getStatusCode());
+ assertTrue(response.getEntity() instanceof ErrorResponse);
+ assertTrue(((ErrorResponse)response.getEntity()).getDetail().equals("Cannot include both attributes and excluded attributes in a single request"));
+ }
+
+ private ScimUser getScimUser() throws PhoneNumberParseException {
+ ScimUser user = new ScimUser();
+
+ user.setActive(true);
+ user.setId("1");
+ user.setExternalId("e1");
+ user.setUserName("jed1");
+ user.setActive(true);
+ user.setNickName("Jonny");
+ user.setPassword("secret");
+ user.setPreferredLanguage("English");
+ user.setProfileUrl("http://example.com/Users/JohnDoe");
+ user.setUserName("jed1");
+ user.setDisplayName("John Doe");
+
+ Name name = new Name();
+ name.setHonorificPrefix("Mr.");
+ name.setGivenName("John");
+ name.setMiddleName("E");
+ name.setFamilyName("Doe");
+ name.setHonorificSuffix("Jr.");
+ name.setFormatted("Mr. John E. Doe Jr.");
+ user.setName(name);
+
+ List<Address> addresses = new ArrayList<>();
+ Address address = new Address();
+ address.setStreetAddress("123 Main St.");
+ address.setLocality("State College");
+ address.setRegion("PA");
+ address.setPostalCode("16801");
+ address.setCountry("USA");
+ address.setType("home");
+ address.setPrimary(true);
+ address.setDisplay("123 Main St. State College, PA 16801");
+ address.setFormatted("123 Main St. State College, PA 16801");
+
+ addresses.add(address);
+
+ address = new Address();
+ address.setStreetAddress("456 Main St.");
+ address.setLocality("State College");
+ address.setRegion("PA");
+ address.setPostalCode("16801");
+ address.setCountry("USA");
+ address.setType("work");
+ address.setPrimary(false);
+ address.setDisplay("456 Main St. State College, PA 16801");
+ address.setFormatted("456 Main St. State College, PA 16801");
+
+ addresses.add(address);
+ user.setAddresses(addresses);
+
+ List<PhoneNumber> phoneNumbers = new ArrayList<>();
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("123-456-7890").countryCode("+1").build();
+ phoneNumber.setDisplay("123-456-7890");
+ phoneNumber.setPrimary(true);
+ phoneNumber.setType("home");
+
+ phoneNumbers.add(phoneNumber);
+
+ phoneNumber = new GlobalPhoneNumberBuilder().globalNumber("1-800-555-1234").build();
+ phoneNumber.setDisplay("1-800-555-1234");
+ phoneNumber.setPrimary(false);
+ phoneNumber.setType("work");
+
+ phoneNumbers.add(phoneNumber);
+ user.setPhoneNumbers(phoneNumbers);
+
+ EnterpriseExtension enterpriseEntension = new EnterpriseExtension();
+ enterpriseEntension.setCostCenter("CC-123");
+ enterpriseEntension.setDepartment("DEPT-xyz");
+ enterpriseEntension.setDivision("DIV-1");
+ enterpriseEntension.setEmployeeNumber("1234567890");
+ Manager manager = new Manager();
+ manager.setDisplayName("Bob Smith");
+ manager.setValue("0987654321");
+ enterpriseEntension.setManager(manager);
+ enterpriseEntension.setOrganization("ORG-X");
+
+ user.addExtension(enterpriseEntension);
+
+ ExampleObjectExtension exampleObjectExtension = new ExampleObjectExtension();
+ exampleObjectExtension.setValueAlways("always");
+ exampleObjectExtension.setValueDefault("default");
+ exampleObjectExtension.setValueNever("never");
+ exampleObjectExtension.setValueRequest("request");
+ ComplexObject valueComplex = new ComplexObject();
+ valueComplex.setDisplayName("ValueComplex");
+ valueComplex.setValue("Value");
+ exampleObjectExtension.setValueComplex(valueComplex);
+
+ user.addExtension(exampleObjectExtension);
+
+ return user;
+ }
+}
diff --git a/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/utility/AttributeUtilTest.java b/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/utility/AttributeUtilTest.java
index 43e6f94..5ae44ee 100644
--- a/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/utility/AttributeUtilTest.java
+++ b/scim-server/scim-server-common/src/test/java/edu/psu/swe/scim/server/utility/AttributeUtilTest.java
@@ -51,7 +51,6 @@
import edu.psu.swe.scim.spec.resources.ScimUser;
import edu.psu.swe.scim.spec.schema.Schema;
-@Ignore
public class AttributeUtilTest {
private static final Logger LOG = LoggerFactory.getLogger(AttributeUtilTest.class);
@@ -124,34 +123,63 @@
Assertions.assertThat(exampleObjectExtension.getValueNever()).isNull();
}
-// @Test
-// @Ignore
-// public void testIncludeAttributes() throws Exception {
-// ScimUser resource = getScimUser();
-//
-// debugJson(resource);
-//
-// Set<AttributeReference> attributes = new HashSet<>();
-// attributes.add(new AttributeReference("userName"));
-// attributes.add(new AttributeReference("addresses.streetAddress"));
-// resource = attributeUtil.setAttributesForDisplay(resource, attributes);
-//
-// debugJson(resource);
-//
-// Assertions.assertThat(resource.getUserName()).isNotNull();
-// Assertions.assertThat(resource.getId()).isNotNull();
-//
-// Assertions.assertThat(resource.getPassword()).isNull();
-// Assertions.assertThat(resource.getActive()).isNull();
-//
-// Assertions.assertThat(resource.getAddresses().get(0).getCountry()).isNull();
-// Assertions.assertThat(resource.getAddresses().get(0).getStreetAddress()).isNotNull();
-//
-//
-// EnterpriseExtension extension = resource.getExtension(EnterpriseExtension.class);
-//
-// // TODO Assertions.assertThat(extension).isNull();
-// }
+ @Test
+ public void testIncludeAttributes() throws Exception {
+ ScimUser resource = getScimUser();
+
+ debugJson(resource);
+
+ Set<AttributeReference> attributes = new HashSet<>();
+ attributes.add(new AttributeReference("userName"));
+ attributes.add(new AttributeReference("addresses.streetAddress"));
+ resource = attributeUtil.setAttributesForDisplay(resource, attributes);
+
+ debugJson(resource);
+
+ Assertions.assertThat(resource.getUserName()).isNotNull();
+ Assertions.assertThat(resource.getId()).isNotNull();
+
+ Assertions.assertThat(resource.getPassword()).isNull();
+ Assertions.assertThat(resource.getActive()).isNull();
+
+ Assertions.assertThat(resource.getAddresses().get(0).getCountry()).isNull();
+ Assertions.assertThat(resource.getAddresses().get(0).getStreetAddress()).isNotNull();
+
+
+ EnterpriseExtension extension = resource.getExtension(EnterpriseExtension.class);
+
+ // TODO Assertions.assertThat(extension).isNull();
+ }
+
+ @Test
+ public void testIncludeFullAttributes() throws Exception {
+ ScimUser resource = getScimUser();
+
+ debugJson(resource);
+
+ Set<AttributeReference> attributes = new HashSet<>();
+ attributes.add(new AttributeReference("userName"));
+ attributes.add(new AttributeReference("name"));
+ attributes.add(new AttributeReference("addresses"));
+ resource = attributeUtil.setAttributesForDisplay(resource, attributes);
+
+ debugJson(resource);
+
+ Assertions.assertThat(resource.getUserName()).isNotNull();
+ Assertions.assertThat(resource.getId()).isNotNull();
+
+ Assertions.assertThat(resource.getPassword()).isNull();
+ Assertions.assertThat(resource.getActive()).isNull();
+
+ Assertions.assertThat(resource.getAddresses().get(0).getCountry()).isNotNull();
+ Assertions.assertThat(resource.getAddresses().get(0).getStreetAddress()).isNotNull();
+ Assertions.assertThat(resource.getAddresses().get(0).getCountry()).isNotNull();
+
+
+ EnterpriseExtension extension = resource.getExtension(EnterpriseExtension.class);
+
+ // TODO Assertions.assertThat(extension).isNull();
+ }
@Test
public void testIncludeAttributesWithExtension() throws Exception {
@@ -184,13 +212,23 @@
public void testExcludeAttributes() throws Exception {
ScimUser resource = getScimUser();
- resource = attributeUtil.setExcludedAttributesForDisplay(resource, Collections.singleton(new AttributeReference("userName")));
+ debugJson(resource);
+
+ Set<AttributeReference> attributeSet = new HashSet<>();
+ attributeSet.add(new AttributeReference("userName"));
+ attributeSet.add(new AttributeReference("addresses"));
+ attributeSet.add(new AttributeReference("name"));
+ resource = attributeUtil.setExcludedAttributesForDisplay(resource, attributeSet);
+
+ debugJson(resource);
Assertions.assertThat(resource.getId()).isNotNull();
Assertions.assertThat(resource.getPassword()).isNull();
Assertions.assertThat(resource.getUserName()).isNull();
Assertions.assertThat(resource.getActive()).isNotNull();
+ Assertions.assertThat(resource.getAddresses()).isNull();
+ Assertions.assertThat(resource.getName()).isNull();
EnterpriseExtension extension = resource.getExtension(EnterpriseExtension.class);
@@ -277,14 +315,18 @@
user.setAddresses(addresses);
List<PhoneNumber> phoneNumbers = new ArrayList<>();
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("123-456-7890", "+1", null).build();
+
+ LocalPhoneNumberBuilder lpnb = new LocalPhoneNumberBuilder();
+
+ PhoneNumber phoneNumber = lpnb.areaCode("123").countryCode("1").subscriberNumber("456-7890").build();
phoneNumber.setDisplay("123-456-7890");
phoneNumber.setPrimary(true);
phoneNumber.setType("home");
phoneNumbers.add(phoneNumber);
- phoneNumber = new GlobalPhoneNumberBuilder("1-800-555-1234").build();
+ phoneNumber = new PhoneNumber();
+ phoneNumber.setValue("tel:+1-800-555-1234");
phoneNumber.setDisplay("1-800-555-1234");
phoneNumber.setPrimary(false);
phoneNumber.setType("work");
diff --git a/scim-server/scim-server-example/pom.xml b/scim-server/scim-server-example/pom.xml
index 6e190e9..0df68f6 100644
--- a/scim-server/scim-server-example/pom.xml
+++ b/scim-server/scim-server-example/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-server</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-server-examples</artifactId>
diff --git a/scim-server/scim-server-example/scim-server-couchdb/pom.xml b/scim-server/scim-server-example/scim-server-couchdb/pom.xml
index 7ea2735..771a3cb 100644
--- a/scim-server/scim-server-example/scim-server-couchdb/pom.xml
+++ b/scim-server/scim-server-example/scim-server-couchdb/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-server-examples</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-server-couchdb</artifactId>
diff --git a/scim-server/scim-server-example/scim-server-memory/pom.xml b/scim-server/scim-server-example/scim-server-memory/pom.xml
index 3e1749b..e8e0188 100644
--- a/scim-server/scim-server-example/scim-server-memory/pom.xml
+++ b/scim-server/scim-server-example/scim-server-memory/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-server-examples</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-server-memory</artifactId>
diff --git a/scim-server/scim-server-example/scim-server-rdbms/pom.xml b/scim-server/scim-server-example/scim-server-rdbms/pom.xml
index 96be19f..0789bbd 100644
--- a/scim-server/scim-server-example/scim-server-rdbms/pom.xml
+++ b/scim-server/scim-server-example/scim-server-rdbms/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-server-examples</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-server-rdbms</artifactId>
diff --git a/scim-spec/pom.xml b/scim-spec/pom.xml
index bae53ba..71103d8 100644
--- a/scim-spec/pom.xml
+++ b/scim-spec/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-spec</artifactId>
diff --git a/scim-spec/scim-spec-protocol/pom.xml b/scim-spec/scim-spec-protocol/pom.xml
index b9981b8..8629789 100644
--- a/scim-spec/scim-spec-protocol/pom.xml
+++ b/scim-spec/scim-spec-protocol/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-spec</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-spec-protocol</artifactId>
diff --git a/scim-spec/scim-spec-protocol/src/main/java/edu/psu/swe/scim/spec/protocol/data/ErrorResponse.java b/scim-spec/scim-spec-protocol/src/main/java/edu/psu/swe/scim/spec/protocol/data/ErrorResponse.java
index 5aed5f4..319f80a 100644
--- a/scim-spec/scim-spec-protocol/src/main/java/edu/psu/swe/scim/spec/protocol/data/ErrorResponse.java
+++ b/scim-spec/scim-spec-protocol/src/main/java/edu/psu/swe/scim/spec/protocol/data/ErrorResponse.java
@@ -1,5 +1,8 @@
package edu.psu.swe.scim.spec.protocol.data;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.xml.bind.annotation.XmlAccessType;
@@ -33,6 +36,8 @@
@XmlElement
private ErrorMessageType scimType;
+ private List<String> errorMessageList;
+
protected ErrorResponse() {
super(SCHEMA_URI);
}
@@ -43,7 +48,23 @@
this.detail = detail;
}
+ public void addErrorMessage(String message) {
+ if (errorMessageList == null) {
+ errorMessageList = new ArrayList<>();
+ }
+
+ errorMessageList.add(message);
+ }
+
public Response toResponse() {
+ if (errorMessageList != null) {
+ StringBuilder sb = new StringBuilder();
+ for (String s : errorMessageList) {
+ sb.append("\n").append(s);
+ }
+ detail += sb.toString();
+ }
+
return Response.status(status).entity(this).build();
}
diff --git a/scim-spec/scim-spec-schema/pom.xml b/scim-spec/scim-spec-schema/pom.xml
index 5ef7707..38fbefb 100644
--- a/scim-spec/scim-spec-schema/pom.xml
+++ b/scim-spec/scim-spec-schema/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-spec</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-spec-schema</artifactId>
diff --git a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/phonenumber/PhoneNumberParseTreeListener.java b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/phonenumber/PhoneNumberParseTreeListener.java
index f4d2034..a4ad23c 100644
--- a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/phonenumber/PhoneNumberParseTreeListener.java
+++ b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/phonenumber/PhoneNumberParseTreeListener.java
@@ -14,11 +14,14 @@
import edu.psu.swe.scim.spec.phonenumber.PhoneNumberParser.PhoneContextContext;
import edu.psu.swe.scim.spec.phonenumber.PhoneNumberParser.PhoneNumberContext;
import edu.psu.swe.scim.spec.resources.PhoneNumber;
+import edu.psu.swe.scim.spec.resources.PhoneNumber.GlobalPhoneNumberBuilder;
+import edu.psu.swe.scim.spec.resources.PhoneNumber.LocalPhoneNumberBuilder;
+import edu.psu.swe.scim.spec.resources.PhoneNumber.PhoneNumberBuilder;
public class PhoneNumberParseTreeListener extends PhoneNumberParserBaseListener {
private static final Logger LOGGER = LoggerFactory.getLogger(PhoneNumberParserBaseListener.class);
- private PhoneNumber phoneNumber = new PhoneNumber();
+ private PhoneNumberBuilder phoneNumberBuilder;
private int indent = -1;
@@ -35,20 +38,20 @@
@Override
public void enterLocalNumber(LocalNumberContext ctx) {
LOGGER.debug(indent("--- Enter LocalNumber -->"));
+ phoneNumberBuilder = new LocalPhoneNumberBuilder();
}
@Override
public void exitLocalNumber(LocalNumberContext ctx) {
LOGGER.debug(indent("<-- Exit LocalNumber ---"));
- phoneNumber.setNumber(ctx.localDigits.getText());
- phoneNumber.setGlobalNumber(false);
+ ((LocalPhoneNumberBuilder) phoneNumberBuilder).subscriberNumber(ctx.localDigits.getText());
if (ctx.Ext() != null && !StringUtils.isBlank(ctx.Ext().getText())) {
- phoneNumber.setExtension(ctx.Ext().getText());
+ ((LocalPhoneNumberBuilder) phoneNumberBuilder).extension(ctx.Ext().getText());
}
if (ctx.Isub() != null && !StringUtils.isBlank(ctx.Isub().getText())) {
- phoneNumber.setSubAddress(ctx.Isub().getText());
+ ((LocalPhoneNumberBuilder) phoneNumberBuilder).subAddress(ctx.Isub().getText());
}
}
@@ -72,11 +75,11 @@
LOGGER.debug(indent("<-- Exit PhoneContext ---"));
if (!ctx.isEmpty()) {
if (ctx.dig != null) {
- phoneNumber.setDomainPhoneContext(false);
- phoneNumber.setPhoneContext("+"+ctx.dig.getText());
+ ((LocalPhoneNumberBuilder) phoneNumberBuilder).isDomainPhoneContext(false);
+ phoneNumberBuilder.phoneContext("+"+ctx.dig.getText());
} else if (ctx.dn != null) {
- phoneNumber.setDomainPhoneContext(true);
- phoneNumber.setPhoneContext(ctx.dn.getText());
+ ((LocalPhoneNumberBuilder) phoneNumberBuilder).isDomainPhoneContext(true);
+ phoneNumberBuilder.phoneContext(ctx.dn.getText());
}
}
}
@@ -90,27 +93,27 @@
public void exitParameter(ParameterContext ctx) {
LOGGER.debug(indent("<-- Exit Parameter ---"));
if (!ctx.isEmpty()) {
- phoneNumber.addParam(ctx.ParamName().getText(), ctx.ParamValue().getText());
+ phoneNumberBuilder.param(ctx.ParamName().getText(), ctx.ParamValue().getText());
}
}
@Override
public void enterGlobalNumber(GlobalNumberContext ctx) {
LOGGER.debug(indent("--- Enter GlobalNumber -->"));
+ phoneNumberBuilder = new GlobalPhoneNumberBuilder();
}
@Override
public void exitGlobalNumber(GlobalNumberContext ctx) {
LOGGER.debug(indent("<-- Exit GlobalNumber ---"));
- phoneNumber.setNumber(ctx.globalDigits.getText() + ctx.GlobalNumberDigits().getText());
- phoneNumber.setGlobalNumber(true);
+ ((GlobalPhoneNumberBuilder) phoneNumberBuilder).globalNumber(ctx.globalDigits.getText() + ctx.GlobalNumberDigits().getText());
if (ctx.Ext() != null && !StringUtils.isBlank(ctx.Ext().getText())) {
- phoneNumber.setExtension(ctx.Ext().getText());
+ phoneNumberBuilder.extension(ctx.Ext().getText());
}
if (ctx.Isub() != null && !StringUtils.isBlank(ctx.Isub().getText())) {
- phoneNumber.setSubAddress(ctx.Isub().getText());
+ phoneNumberBuilder.subAddress(ctx.Isub().getText());
}
}
@@ -146,8 +149,8 @@
return sb.toString();
}
- public PhoneNumber getPhoneNumber() {
- return phoneNumber;
+ public PhoneNumber getPhoneNumber() throws PhoneNumberParseException {
+ return phoneNumberBuilder.build(false);
}
}
diff --git a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/Name.java b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/Name.java
index 4385cd7..102c4e0 100644
--- a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/Name.java
+++ b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/Name.java
@@ -22,7 +22,7 @@
"honorificSuffix"
})
@XmlAccessorType(XmlAccessType.NONE)
-public class Name extends KeyedResource implements Serializable {
+public class Name implements Serializable {
private static final long serialVersionUID = -2761413543859555141L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/PhoneNumber.java b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/PhoneNumber.java
index e02f29b..e6a2e95 100644
--- a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/PhoneNumber.java
+++ b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/PhoneNumber.java
@@ -5,7 +5,6 @@
import java.io.Serializable;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -19,7 +18,6 @@
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.ParseTreeWalker;
import org.apache.commons.lang3.StringUtils;
@@ -33,6 +31,7 @@
import edu.psu.swe.scim.spec.phonenumber.PhoneNumberParser;
import lombok.AccessLevel;
import lombok.Data;
+import lombok.Getter;
import lombok.Setter;
/**
@@ -43,39 +42,61 @@
@XmlType
@XmlAccessorType(XmlAccessType.NONE)
-@Data
public class PhoneNumber extends KeyedResource implements Serializable, TypedAttribute {
private static final long serialVersionUID = 607319505715224096L;
-
+
private static final String VISUAL_SEPARATORS = "[\\(\\)\\-\\.]";
- @Setter(AccessLevel.NONE)
- @XmlElement
@ScimAttribute(description = "Phone number of the User")
String value;
@XmlElement
@ScimAttribute(description = "A human readable name, primarily used for display purposes. READ-ONLY.")
+ @Getter
+ @Setter
String display;
@XmlElement
@ScimAttribute(canonicalValueList = { "work", "home", "mobile", "fax", "pager", "other" }, description = "A label indicating the attribute's function; e.g., 'work' or 'home' or 'mobile' etc.")
+ @Getter
+ @Setter
String type;
@XmlElement
@ScimAttribute(description = "A Boolean value indicating the 'primary' or preferred attribute value for this attribute, e.g. the preferred phone number or primary phone number. The primary attribute value 'true' MUST appear no more than once.")
+ @Getter
+ @Setter
Boolean primary;
- String rawValue;
+ @Setter(AccessLevel.NONE)
+ @Getter
boolean isGlobalNumber = false;
+
+ @Getter
+ @Setter(AccessLevel.NONE)
String number;
+
+ @Setter(AccessLevel.NONE)
+ @Getter
String extension;
+
+ @Setter(AccessLevel.NONE)
+ @Getter
String subAddress;
+
+ @Setter(AccessLevel.NONE)
+ @Getter
String phoneContext;
+
+ @Setter(AccessLevel.NONE)
+ @Getter
boolean isDomainPhoneContext = false;
+
+ @Getter
+ @Setter(AccessLevel.NONE)
Map<String, String> params;
-
+
public void addParam(String name, String value) {
if (this.params == null) {
this.params = new HashMap<String, String>();
@@ -84,7 +105,20 @@
this.params.put(name, value);
}
+ // This is annotated here to ensure that JAXB uses the setter rather than
+ // reflection
+ // to assigned the value. Do not move the XmlElement annotation to the field
+ // please.
+ @XmlElement
+ public String getValue() {
+ return value;
+ }
+
public void setValue(String value) throws PhoneNumberParseException {
+ if (value == null) {
+ throw new PhoneNumberParseException("null values are illegal for phone numbers");
+ }
+
PhoneNumberLexer phoneNumberLexer = new PhoneNumberLexer(new ANTLRInputStream(value));
PhoneNumberParser p = new PhoneNumberParser(new CommonTokenStream(phoneNumberLexer));
p.setBuildParseTree(true);
@@ -103,11 +137,10 @@
} catch (IllegalStateException e) {
throw new PhoneNumberParseException(e);
}
-
+
PhoneNumber parsedPhoneNumber = tpl.getPhoneNumber();
-
- this.value = value;
- this.rawValue = value;
+
+ this.value = parsedPhoneNumber.getValue();
this.number = parsedPhoneNumber.getNumber();
this.extension = parsedPhoneNumber.getExtension();
this.subAddress = parsedPhoneNumber.getSubAddress();
@@ -116,7 +149,7 @@
this.isGlobalNumber = parsedPhoneNumber.isGlobalNumber();
this.isDomainPhoneContext = parsedPhoneNumber.isDomainPhoneContext();
}
-
+
/*
* Implements RFC 3996 URI Equality for the value property
* https://tools.ietf.org/html/rfc3966#section-3
@@ -130,11 +163,10 @@
if (getClass() != obj.getClass())
return false;
PhoneNumber other = (PhoneNumber) obj;
-
+
if (isGlobalNumber != other.isGlobalNumber)
return false;
-
-
+
String numberWithoutVisualSeparators = number != null ? number.replaceAll(VISUAL_SEPARATORS, "") : null;
String otherNumberWithoutVisualSeparators = other.number != null ? other.number.replaceAll(VISUAL_SEPARATORS, "") : null;
if (numberWithoutVisualSeparators == null) {
@@ -142,8 +174,7 @@
return false;
} else if (!numberWithoutVisualSeparators.equals(otherNumberWithoutVisualSeparators))
return false;
-
-
+
String extensionWithoutVisualSeparators = extension != null ? extension.replaceAll(VISUAL_SEPARATORS, "") : null;
String otherExtensionWithoutVisualSeparators = other.extension != null ? other.extension.replaceAll(VISUAL_SEPARATORS, "") : null;
if (extensionWithoutVisualSeparators == null) {
@@ -151,20 +182,18 @@
return false;
} else if (!extensionWithoutVisualSeparators.equals(otherExtensionWithoutVisualSeparators))
return false;
-
-
+
if (subAddress == null) {
if (other.subAddress != null)
return false;
} else if (!subAddress.equalsIgnoreCase(other.subAddress))
return false;
-
String phoneContextTemp = phoneContext;
if (!StringUtils.isBlank(phoneContext) && !isDomainPhoneContext) {
phoneContextTemp = phoneContext.replaceAll(VISUAL_SEPARATORS, "");
}
-
+
String otherPhoneContextTemp = other.phoneContext;
if (!StringUtils.isBlank(other.phoneContext) && !other.isDomainPhoneContext) {
otherPhoneContextTemp = other.phoneContext.replaceAll(VISUAL_SEPARATORS, "");
@@ -175,27 +204,23 @@
return false;
} else if (!phoneContextTemp.equalsIgnoreCase(otherPhoneContextTemp))
return false;
-
-
+
if (!equalsIgnoreCaseAndOrderParams(other.params)) {
return false;
}
-
-
+
if (primary == null) {
if (other.primary != null)
return false;
} else if (!primary.equals(other.primary))
return false;
-
-
+
if (type == null) {
if (other.type != null)
return false;
} else if (!type.equalsIgnoreCase(other.type))
return false;
-
-
+
return true;
}
@@ -217,42 +242,41 @@
result = prime * result + ((type == null) ? 0 : type.toLowerCase().hashCode());
return result;
}
-
+
HashMap<String, String> paramsToLowerCase() {
HashMap<String, String> paramsLowercase = new HashMap<String, String>();
- for(Entry<String, String> entry : params.entrySet()) {
+ for (Entry<String, String> entry : params.entrySet()) {
paramsLowercase.put(entry.getKey().toLowerCase(), entry.getValue().toLowerCase());
}
-
+
return paramsLowercase;
}
-
+
boolean equalsIgnoreCaseAndOrderParams(Map<String, String> otherParams) {
if (params == null && otherParams == null) {
return true;
}
-
- if ((params == null && otherParams != null) ||
- (params != null && otherParams == null) ||
- (params.size() != otherParams.size())) {
+
+ if ((params == null && otherParams != null) || (params != null && otherParams == null) || (params.size() != otherParams.size())) {
return false;
}
-
- HashMap<String, String> paramsLowercase = paramsToLowerCase();
-
- for(Entry<String, String> entry : otherParams.entrySet()) {
+
+ HashMap<String, String> paramsLowercase = paramsToLowerCase();
+
+ for (Entry<String, String> entry : otherParams.entrySet()) {
String foundValue = paramsLowercase.get(entry.getKey().toLowerCase());
-
+
if (!entry.getValue().equalsIgnoreCase(foundValue)) {
return false;
}
}
-
+
return true;
}
-
- protected static class PhoneNumberBuilder {
-
+
+ @Data
+ public abstract static class PhoneNumberBuilder {
+
static final Logger LOGGER = LoggerFactory.getLogger(PhoneNumberBuilder.class);
final String HYPHEN = "-";
@@ -266,7 +290,7 @@
final String DOMAIN_NAME_REGEX = "^[a-zA-Z0-9\\.\\-]+$";
final String GLOBAL_NUMBER_REGEX = "^(\\+)?[\\d\\.\\-\\(\\)]+$";
final String COUNTRY_CODE_REGEX = "^(\\+)?[1-9][0-9]{0,2}$";
-
+
String number;
String display;
String extension;
@@ -274,12 +298,36 @@
String phoneContext;
Map<String, String> params;
- void setParam(String name, String value) {
+ boolean isGlobalNumber = false;
+ boolean isDomainPhoneContext = false;
+
+ public PhoneNumberBuilder display(String display) {
+ this.display = display;
+ return this;
+ }
+
+ public PhoneNumberBuilder extension(String extension) {
+ this.extension = extension;
+ return this;
+ }
+
+ public PhoneNumberBuilder subAddress(String subAddress) {
+ this.subAddress = subAddress;
+ return this;
+ }
+
+ public PhoneNumberBuilder phoneContext(String phoneContext) {
+ this.phoneContext = phoneContext;
+ return this;
+ }
+
+ public PhoneNumberBuilder param(String name, String value) {
if (this.params == null) {
this.params = new HashMap<String, String>();
}
this.params.put(name, value);
+ return this;
}
String getFormattedExtension() {
@@ -314,7 +362,7 @@
paramsFormatted += String.format(PARAMS_STRING, entry.getKey(), entry.getValue() != null ? entry.getValue() : "");
}
}
-
+
return !paramsFormatted.isEmpty() ? paramsFormatted : null;
}
@@ -344,30 +392,42 @@
return !valueString.isEmpty() ? valueString : null;
}
- PhoneNumber build() throws PhoneNumberParseException {
+ public PhoneNumber build() throws PhoneNumberParseException {
+ return build(true);
+ }
+
+ public PhoneNumber build(boolean validate) throws PhoneNumberParseException {
if (!StringUtils.isBlank(extension) && !StringUtils.isBlank(subAddress)) {
throw new IllegalArgumentException("PhoneNumberBuilder cannot have a value for both extension and subAddress.");
}
-
+
if (extension != null && !extension.matches(LOCAL_SUBSCRIBER_NUMBER_REGEX)) {
throw new IllegalArgumentException("PhoneNumberBuilder extension must contain only numeric characters and optional ., -, (, ) visual separator characters.");
}
-
+
if (params != null && !params.isEmpty()) {
- if (params.get("") != null ||
- params.get(null) != null ||
- params.values().contains(null) ||
- params.values().contains("")) {
- throw new IllegalArgumentException("PhoneNumberBuilder params names and values cannot be null or empty.");
+ if (params.get("") != null || params.get(null) != null || params.values().contains(null) || params.values().contains("")) {
+ throw new IllegalArgumentException("PhoneNumberBuilder params names and values cannot be null or empty.");
}
}
-
+
PhoneNumber phoneNumber = new PhoneNumber();
String formattedValue = getFormattedValue();
- LOGGER.info("" + formattedValue);
- phoneNumber.setValue(formattedValue);
+ LOGGER.debug("" + formattedValue);
+ if (validate) {
+ phoneNumber.setValue(formattedValue);
+ } else {
+ phoneNumber.value = formattedValue;
+ phoneNumber.extension = this.extension;
+ phoneNumber.isDomainPhoneContext = this.isDomainPhoneContext;
+ phoneNumber.isGlobalNumber = this.isGlobalNumber;
+ phoneNumber.number = this.number;
+ phoneNumber.params = this.params;
+ phoneNumber.phoneContext = this.phoneContext;
+ phoneNumber.subAddress = this.subAddress;
+ }
return phoneNumber;
}
}
@@ -377,108 +437,110 @@
String countryCode;
String areaCode;
String domainName;
-
- public LocalPhoneNumberBuilder(String subscriberNumber, String countryCode, String areaCode) {
+
+ public LocalPhoneNumberBuilder subscriberNumber(String subscriberNumber) {
this.subscriberNumber = subscriberNumber;
- this.countryCode = countryCode;
+ this.number = subscriberNumber;
+ return this;
+ }
+
+ public LocalPhoneNumberBuilder countryCode(String countryCode) {
+
+ String localCode = countryCode;
+
+ if (localCode != null && !localCode.isEmpty()) {
+ localCode = localCode.trim();
+ if (localCode.length() > 0 && localCode.charAt(0) != '+') {
+ localCode = '+' + localCode;
+ }
+ }
+ this.countryCode = localCode;
+ return this;
+ }
+
+ public LocalPhoneNumberBuilder areaCode(String areaCode) {
this.areaCode = areaCode;
+ return this;
}
- public LocalPhoneNumberBuilder(String subscriberNumber, String domainName) {
- this.subscriberNumber = subscriberNumber;
+ public LocalPhoneNumberBuilder domainName(String domainName) {
this.domainName = domainName;
- }
-
- public LocalPhoneNumberBuilder extension(String extension) {
- this.extension = extension;
return this;
}
- public LocalPhoneNumberBuilder subAddress(String subAddress) {
- this.subAddress = subAddress;
+ public LocalPhoneNumberBuilder isDomainPhoneContext(boolean hasDomainPhoneContext) {
+ this.isDomainPhoneContext = hasDomainPhoneContext;
return this;
}
- public LocalPhoneNumberBuilder param(String name, String value) {
- super.setParam(name, value);
- return this;
- }
-
+ @Override
public PhoneNumber build() throws PhoneNumberParseException {
- if (StringUtils.isBlank(subscriberNumber) || !subscriberNumber.matches(LOCAL_SUBSCRIBER_NUMBER_REGEX) ) {
+ if (StringUtils.isBlank(subscriberNumber) || !subscriberNumber.matches(LOCAL_SUBSCRIBER_NUMBER_REGEX)) {
throw new IllegalArgumentException("LocalPhoneNumberBuilder subscriberNumber must contain only numeric characters and optional ., -, (, ) visual separator characters.");
}
-
- this.number = subscriberNumber;
if (StringUtils.isBlank(countryCode) && StringUtils.isBlank(domainName)) {
throw new IllegalArgumentException("LocalPhoneNumberBuilder must have values for domainName or countryCode.");
}
-
+
if (StringUtils.isBlank(domainName)) {
if (StringUtils.isBlank(countryCode) || !countryCode.matches(COUNTRY_CODE_REGEX)) {
throw new IllegalArgumentException("LocalPhoneNumberBuilder countryCode must contain only numeric characters and an optional plus (+) prefix.");
}
-
+
if (areaCode != null && !StringUtils.isNumeric(areaCode)) {
throw new IllegalArgumentException("LocalPhoneNumberBuilder areaCode must contain only numberic characters.");
}
-
+
if (!countryCode.startsWith(INTERNATIONAL_PREFIX)) {
this.phoneContext = INTERNATIONAL_PREFIX + countryCode;
} else {
this.phoneContext = countryCode;
}
-
+
if (!StringUtils.isBlank(areaCode)) {
this.phoneContext += (HYPHEN + areaCode);
}
-
+
} else {
if (!domainName.matches(DOMAIN_NAME_REGEX)) {
throw new IllegalArgumentException("LocalPhoneNumberBuilder domainName must contain only alphanumeric, . and - characters.");
}
-
+
this.phoneContext = domainName;
}
-
+
return super.build();
}
}
public static class GlobalPhoneNumberBuilder extends PhoneNumberBuilder {
String globalNumber;
-
- public GlobalPhoneNumberBuilder(String globalNumber) {
+
+ public GlobalPhoneNumberBuilder() {
+ this.isGlobalNumber = true;
+ }
+
+ public GlobalPhoneNumberBuilder globalNumber(String globalNumber) {
this.globalNumber = globalNumber;
- }
-
- public GlobalPhoneNumberBuilder extension(String extension) {
- this.extension = extension;
+
+ if (globalNumber != null) {
+ if (globalNumber.startsWith(INTERNATIONAL_PREFIX)) {
+ this.number = globalNumber;
+ } else {
+ this.number = INTERNATIONAL_PREFIX + globalNumber;
+ }
+ }
+
return this;
}
- public GlobalPhoneNumberBuilder subAddress(String subAddress) {
- this.subAddress = subAddress;
- return this;
- }
-
- public GlobalPhoneNumberBuilder param(String name, String value) {
- super.setParam(name, value);
- return this;
- }
-
+ @Override
public PhoneNumber build() throws PhoneNumberParseException {
if (StringUtils.isBlank(globalNumber) || !globalNumber.matches(GLOBAL_NUMBER_REGEX)) {
throw new IllegalArgumentException("GlobalPhoneNumberBuilder globalNumber must contain only numeric characters, optional ., -, (, ) visual separators, and an optional plus (+) prefix.");
}
- if (globalNumber.startsWith(INTERNATIONAL_PREFIX)) {
- this.number = globalNumber;
- } else {
- this.number = INTERNATIONAL_PREFIX + globalNumber;
- }
-
return super.build();
}
}
diff --git a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/ScimUser.java b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/ScimUser.java
index fdd35e3..702b204 100644
--- a/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/ScimUser.java
+++ b/scim-spec/scim-spec-schema/src/main/java/edu/psu/swe/scim/spec/resources/ScimUser.java
@@ -2,11 +2,13 @@
import java.io.Serializable;
import java.util.List;
+import java.util.Optional;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.registry.infomodel.TelephoneNumber;
import edu.psu.swe.scim.spec.annotation.ScimAttribute;
import edu.psu.swe.scim.spec.annotation.ScimResourceType;
@@ -119,4 +121,22 @@
public String getResourceType() {
return RESOURCE_NAME;
}
+
+ public Optional<Address> getPrimaryAddress() {
+ return addresses.stream()
+ .filter(a -> a.primary)
+ .findFirst();
+ }
+
+ public Optional<Email> getPrimaryEmailAddress() {
+ return emails.stream()
+ .filter(e -> e.getPrimary())
+ .findFirst();
+ }
+
+ public Optional<PhoneNumber> getPrimaryPhoneNumber() {
+ return phoneNumbers.stream()
+ .filter(p -> p.getPrimary())
+ .findFirst();
+ }
}
diff --git a/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberBuilderTest.java b/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberBuilderTest.java
index d7da5fb..261de8f 100644
--- a/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberBuilderTest.java
+++ b/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberBuilderTest.java
@@ -82,7 +82,7 @@
LOGGER.info("invalid subscriber number '" + invalidSubscriberNumber + "' start");
try {
- new LocalPhoneNumberBuilder(invalidSubscriberNumber, null, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber(invalidSubscriberNumber).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(SUBSCRIBER_NUMBER));
@@ -91,7 +91,7 @@
String temp = invalidSubscriberNumber != null ? (" " + invalidSubscriberNumber + " ") : null;
LOGGER.info("invalid subscriber number '" + temp + "' start");
try {
- new LocalPhoneNumberBuilder(temp, null, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber(temp).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(SUBSCRIBER_NUMBER));
@@ -103,7 +103,7 @@
public void test_invalid_padded_subscriberNumber_for_LocalPhoneNumberBuilder() throws Exception {
//parameterized value coming into test method has spaces stripped from beginning and end; need to test that spaces are not allowed at all
try {
- new LocalPhoneNumberBuilder(" 23 ", null, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber(" 23 ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(SUBSCRIBER_NUMBER));
@@ -116,7 +116,7 @@
LOGGER.info("valid subscriber number '" + validSubscriberNumber + "' start");
try {
- new LocalPhoneNumberBuilder(validSubscriberNumber, null, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber(validSubscriberNumber).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assertTrue("Exception should have been for country code.", ex.getMessage().contains(COUNTRY_CODE));
@@ -170,7 +170,7 @@
LOGGER.info("invalid country code '" + invalidCountryCode + "' start");
try {
- new LocalPhoneNumberBuilder("123-4567", invalidCountryCode, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode(invalidCountryCode).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
LOGGER.info(ex.getMessage());
@@ -180,7 +180,7 @@
String temp = invalidCountryCode != null ? (" " + invalidCountryCode + " ") : null;
LOGGER.info("invalid country code '" + temp + "' start");
try {
- new LocalPhoneNumberBuilder("123-4567", temp, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode(temp).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(COUNTRY_CODE));
@@ -188,23 +188,12 @@
}
@Test
- public void test_invalid_padded_countryCode_for_LocalPhoneNumberBuilder() throws Exception {
- try {
- new LocalPhoneNumberBuilder("123-4567", " 23 ", null).build();
- fail(FAILURE_MESSAGE);
- } catch (IllegalArgumentException ex) {
- LOGGER.info(ex.getMessage());
- assert (ex.getMessage().contains(COUNTRY_CODE));
- }
- }
-
- @Test
@Parameters(method = "getValidCountryCodes")
public void test_valid_countryCode_for_LocalPhoneNumberBuilder(String validCountryCode) throws Exception {
LOGGER.info("valid country code '" + validCountryCode + "' start");
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("123-4567", validCountryCode, null).build();
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode(validCountryCode).build();
assertNull("Extension should be null", phoneNumber.getExtension());
assertNull("SubAddress should be null", phoneNumber.getSubAddress());
assertEquals("123-4567", phoneNumber.getNumber());
@@ -250,7 +239,7 @@
LOGGER.info("invalid area code '" + invalidAreaCode + "' start");
try {
- new LocalPhoneNumberBuilder("123-4567", "23", invalidAreaCode).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode("23").areaCode(invalidAreaCode).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
LOGGER.info(ex.getMessage());
@@ -260,7 +249,7 @@
String temp = invalidAreaCode != null ? (" " + invalidAreaCode + " ") : null;
LOGGER.info("invalid area code '" + temp + "' start");
try {
- new LocalPhoneNumberBuilder("123-4567", "23", temp).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode("23").areaCode(temp).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(AREA_CODE));
@@ -270,7 +259,7 @@
@Test
public void test_invalid_padded_areaCode_for_LocalPhoneNumberBuilder() throws Exception {
try {
- new LocalPhoneNumberBuilder("123-4567", "23", " 2 ").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode("23").areaCode(" 2 ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
LOGGER.info("padded areaCode ->" + ex.getMessage());
@@ -278,7 +267,7 @@
}
try {
- new LocalPhoneNumberBuilder("123-4567", "23", " ").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode("23").areaCode(" ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
LOGGER.info("padded areaCode ->" + ex.getMessage());
@@ -288,13 +277,13 @@
@Test
public void test_areaCode_can_be_null_for_LocalPhoneNumberBuilder() throws Exception {
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("123-4567", "23", null).build();
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode("23").build();
assertNull("Extension should be null", phoneNumber.getExtension());
assertNull("SubAddress should be null", phoneNumber.getSubAddress());
assertEquals("123-4567", phoneNumber.getNumber());
assertEquals("+23", phoneNumber.getPhoneContext());
assertEquals("tel:123-4567;phone-context=+23", phoneNumber.getValue());
- }
+ }
@Test
@Parameters(method = "getValidAreaCodes")
@@ -302,7 +291,7 @@
LOGGER.info("valid area code '" + validAreaCode + "' start");
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("123-4567", "23", validAreaCode).build();
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("123-4567").countryCode("23").areaCode(validAreaCode).build();
assertNull("Extension should be null", phoneNumber.getExtension());
assertNull("SubAddress should be null", phoneNumber.getSubAddress());
assertEquals("123-4567", phoneNumber.getNumber());
@@ -419,7 +408,7 @@
LOGGER.info("invalid global number '" + invalidGlobalNumber + "' start");
try {
- new GlobalPhoneNumberBuilder(invalidGlobalNumber).build();
+ new GlobalPhoneNumberBuilder().globalNumber(invalidGlobalNumber).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(GLOBAL_NUMBER));
@@ -428,7 +417,7 @@
String temp = invalidGlobalNumber != null ? (" " + invalidGlobalNumber + " ") : null;
LOGGER.info("invalid global number '" + temp + "' start");
try {
- new GlobalPhoneNumberBuilder(temp).build();
+ new GlobalPhoneNumberBuilder().globalNumber(temp).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(GLOBAL_NUMBER));
@@ -440,7 +429,7 @@
public void test_invalid_padded_gloablNumber_for_GlobalPhoneNumberBuilder() throws Exception {
//parameterized value coming into test method has spaces stripped from beginning and end; need to test that spaces are not allowed at all
try {
- new GlobalPhoneNumberBuilder(" 23 ").build();
+ new GlobalPhoneNumberBuilder().globalNumber(" 23 ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(GLOBAL_NUMBER));
@@ -453,7 +442,7 @@
LOGGER.info("valid global number '" + validGlobalNumber + "' start");
- PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder(validGlobalNumber).build();
+ PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder().globalNumber(validGlobalNumber).build();
assertNull("Extension should be null", phoneNumber.getExtension());
assertNull("SubAddress should be null", phoneNumber.getSubAddress());
assertNull("PhoneContext should be null", phoneNumber.getPhoneContext());
@@ -469,7 +458,7 @@
String temp = validGlobalNumber.replace("+", "");
LOGGER.info("valid global number '" + temp + "' start");
- PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder(temp).build();
+ PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder().globalNumber(temp).build();
assertNull("Extension should be null", phoneNumber.getExtension());
assertNull("SubAddress should be null", phoneNumber.getSubAddress());
assertNull("PhoneContext should be null", phoneNumber.getPhoneContext());
@@ -509,7 +498,7 @@
LOGGER.info("invalid domain name '" + invalidDomainName + "' start");
try {
- new LocalPhoneNumberBuilder("1707", invalidDomainName).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName(invalidDomainName).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME));
@@ -518,7 +507,7 @@
String temp = invalidDomainName != null ? (" " + invalidDomainName + " ") : null;
LOGGER.info("invalid domain name '" + temp + "' start");
try {
- new LocalPhoneNumberBuilder("1707", temp).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName(temp).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME));
@@ -530,7 +519,7 @@
public void test_invalid_padded_domainName_for_LocalPhoneNumberBuilder() throws Exception {
//parameterized value coming into test method has spaces stripped from beginning and end; need to test that spaces are not allowed at all
try {
- new LocalPhoneNumberBuilder("1707", " 23 ").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName(" 23 ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME));
@@ -540,42 +529,42 @@
@Test
public void test_no_domainName_coutryCode_or_areaCode_for_LocalPhoneNumberBuilder() throws Exception {
try {
- new LocalPhoneNumberBuilder("1707", null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName(null).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME) && ex.getMessage().contains(COUNTRY_CODE));
}
try {
- new LocalPhoneNumberBuilder("1707", "").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName("").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME) && ex.getMessage().contains(COUNTRY_CODE));
}
try {
- new LocalPhoneNumberBuilder("1707", " ").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName(" ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME) && ex.getMessage().contains(COUNTRY_CODE));
}
try {
- new LocalPhoneNumberBuilder("222-1707", null, null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("222-1707").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME) && ex.getMessage().contains(COUNTRY_CODE));
}
try {
- new LocalPhoneNumberBuilder("222-1707", "", "").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("222-1707").countryCode("").areaCode("").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME) && ex.getMessage().contains(COUNTRY_CODE));
}
try {
- new LocalPhoneNumberBuilder("222-1707", " ", " ").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("222-1707").countryCode(" ").areaCode(" ").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(DOMAIN_NAME) && ex.getMessage().contains(COUNTRY_CODE));
@@ -588,7 +577,7 @@
LOGGER.info("valid domain name '" + validDomainName + "' start");
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("1707", validDomainName).build();
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName(validDomainName).build();
assertNull("Extension should be null", phoneNumber.getExtension());
assertNull("SubAddress should be null", phoneNumber.getSubAddress());
@@ -599,7 +588,7 @@
@Test
public void test_extension_subAddress_conflict_for_GlobalPhoneNumberBuilder() throws PhoneNumberParseException {
- GlobalPhoneNumberBuilder builder = new GlobalPhoneNumberBuilder("+1-888-888-5555");
+ GlobalPhoneNumberBuilder builder = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555");
builder.build(); //should be valid builder at this point
builder.extension("1234");
@@ -615,7 +604,7 @@
@Test
public void test_extension_subAddress_conflict_for_LocalPhoneNumberBuilder() throws PhoneNumberParseException {
- LocalPhoneNumberBuilder builder = new LocalPhoneNumberBuilder("888-5555", "+1", "888");
+ LocalPhoneNumberBuilder builder = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888");
builder.build(); //should be valid builder at this point
builder.extension("1234");
@@ -631,7 +620,7 @@
@Test
public void test_extension_for_GlobalPhoneNumberBuilder() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.extension("1234")
.build();
@@ -645,7 +634,7 @@
@Test
public void test_extension_for_LocalPhoneNumberBuilder() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.extension("1234")
.build();
@@ -659,7 +648,7 @@
@Test
public void test_subAddress_for_GlobalPhoneNumberBuilder() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.subAddress("example.a.com")
.build();
@@ -673,7 +662,7 @@
@Test
public void test_subAddress_for_LocalPhoneNumberBuilder() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.subAddress("example.a.com")
.build();
@@ -687,7 +676,7 @@
@Test
public void test_adding_params_for_GlobalPhoneNumberBuilder() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phoneNumber = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.extension("1234")
.param("example", "gh234")
.param("milhouse", "simpson")
@@ -703,7 +692,7 @@
@Test
public void test_adding_params_for_LocalPhoneNumberBuilder() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.subAddress("example.a.com")
.param("example", "gh234")
.param("milhouse", "simpson")
@@ -720,7 +709,7 @@
@Test
public void test_adding_invalid_param_to_GlobalPhoneNumberBuilder() throws PhoneNumberParseException {
try{
- new GlobalPhoneNumberBuilder("+1-888-888-5555").param("example_", "gh234").build();
+ new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").param("example_", "gh234").build();
fail(FAILURE_MESSAGE);
} catch (PhoneNumberParseException ex) {
assert (ex.getMessage().contains(FAILED_TO_PARSE));
@@ -728,7 +717,7 @@
}
try{
- new GlobalPhoneNumberBuilder("+1-888-888-5555").param("example", "gh234^").build();
+ new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").param("example", "gh234^").build();
fail(FAILURE_MESSAGE);
} catch (PhoneNumberParseException ex) {
assert (ex.getMessage().contains(FAILED_TO_PARSE));
@@ -736,28 +725,28 @@
}
try{
- new GlobalPhoneNumberBuilder("+1-888-888-5555").param(null, "gh234").build();
+ new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").param(null, "gh234").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
}
try{
- new GlobalPhoneNumberBuilder("+1-888-888-5555").param("", "gh234").build();
+ new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").param("", "gh234").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
}
try{
- new GlobalPhoneNumberBuilder("+1-888-888-5555").param("a", null).build();
+ new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").param("a", null).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
}
try{
- new GlobalPhoneNumberBuilder("+1-888-888-5555").param("a", "").build();
+ new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").param("a", "").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
@@ -767,7 +756,7 @@
@Test
public void test_adding_invalid_param_to_LocalPhoneNumberBuilder() throws PhoneNumberParseException {
try{
- new LocalPhoneNumberBuilder("888-5555","+1","814").param("example*", "gh234").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("814").param("example*", "gh234").build();
fail(FAILURE_MESSAGE);
} catch (PhoneNumberParseException ex) {
assert (ex.getMessage().contains(FAILED_TO_PARSE));
@@ -775,7 +764,7 @@
}
try{
- new LocalPhoneNumberBuilder("888-5555","+1","814").param("example", "gh234\\").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("814").param("example", "gh234\\").build();
fail(FAILURE_MESSAGE);
} catch (PhoneNumberParseException ex) {
assert (ex.getMessage().contains(FAILED_TO_PARSE));
@@ -783,28 +772,28 @@
}
try{
- new LocalPhoneNumberBuilder("888-5555","+1","814").param(null, "gh234").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("814").param(null, "gh234").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
}
try{
- new LocalPhoneNumberBuilder("888-5555","+1","814").param("", "gh234").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("814").param("", "gh234").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
}
try{
- new LocalPhoneNumberBuilder("888-5555","+1","814").param("a", null).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("814").param("a", null).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
}
try{
- new LocalPhoneNumberBuilder("888-5555","+1","814").param("a", "").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("814").param("a", "").build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(PARAMS_NAME_VALUE));
@@ -813,7 +802,7 @@
@Test
public void test_valid_subAddress() throws PhoneNumberParseException {
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("1707","example.a.com")
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName("example.a.com")
.subAddress("%20azAZ09?@=,+$&/:_!~.-()")
.build();
@@ -828,7 +817,7 @@
@Test
public void test_invalid_subAddress() {
try {
- new LocalPhoneNumberBuilder("1707","example.a.com").subAddress("azAZ09^example.(com)").build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1707").domainName("example.a.com").subAddress("azAZ09^example.(com)").build();
fail(FAILURE_MESSAGE);
} catch (PhoneNumberParseException ex) {
assert (ex.getMessage().contains(FAILED_TO_PARSE));
@@ -885,7 +874,7 @@
public void test_valid_extension(String validExtension) throws PhoneNumberParseException {
LOGGER.info("valid extension '" + validExtension + "' start");
- PhoneNumber phoneNumber = new LocalPhoneNumberBuilder("1234-5678","+44", "20")
+ PhoneNumber phoneNumber = new LocalPhoneNumberBuilder().subscriberNumber("1234-5678").countryCode("+44").areaCode("20")
.extension(validExtension)
.build();
@@ -902,7 +891,7 @@
public void test_invalid_extension(String invalidExtension) throws PhoneNumberParseException {
LOGGER.info("invalid extension " + invalidExtension);
try {
- new LocalPhoneNumberBuilder("1234-5678","+44", "20").extension(invalidExtension).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1234-5678").countryCode("+44").areaCode("20").extension(invalidExtension).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(EXTENSION));
@@ -911,7 +900,7 @@
String temp = invalidExtension != null ? (" " + invalidExtension + " ") : null;
LOGGER.info("invalid extension '" + temp + "' start");
try {
- new LocalPhoneNumberBuilder("1234-5678","+44", "20").extension(invalidExtension).build();
+ new LocalPhoneNumberBuilder().subscriberNumber("1234-5678").countryCode("+44").areaCode("20").extension(invalidExtension).build();
fail(FAILURE_MESSAGE);
} catch (IllegalArgumentException ex) {
assert (ex.getMessage().contains(EXTENSION));
@@ -921,7 +910,7 @@
@Test
public void test_paramsToLowerCase() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.param("ABCDE", "FGHIJKLM")
.param("NOPQR", "STUVWXYZ.-_")
.build();
@@ -935,12 +924,12 @@
@Test
public void test_equalsIgnoreCaseAndOrderParams_not_equal() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.param("A", "B")
.param("C", "D_")
.build();
- PhoneNumber phOther = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phOther = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.param("A", "B")
.param("C", "E_")
.build();
@@ -950,12 +939,12 @@
@Test
public void test_equalsIgnoreCaseAndOrderParams_equal() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.param("A", "B")
.param("C", "D_")
.build();
- PhoneNumber phOther = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phOther = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.param("c", "D_")
.param("A", "b")
.build();
@@ -965,16 +954,16 @@
@Test
public void test_equalsAndHashCode_globalNumber() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555").build();
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").build();
assert(ph.isGlobalNumber());
- PhoneNumber phSame = new GlobalPhoneNumberBuilder("+1-888-888-5555").build();
+ PhoneNumber phSame = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").build();
assert(phSame.isGlobalNumber());
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
assertFalse(localPh.isGlobalNumber());
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
assertFalse(localPhSame.isGlobalNumber());
assertEquals(ph, phSame);
@@ -985,11 +974,11 @@
@Test
public void test_equalsAndHashCode_number() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555").build();
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555").build();
- PhoneNumber phSame = new GlobalPhoneNumberBuilder("+18888885555").build();
+ PhoneNumber phSame = new GlobalPhoneNumberBuilder().globalNumber("+18888885555").build();
- PhoneNumber phDiff = new GlobalPhoneNumberBuilder("+1-888-888-5556").build();
+ PhoneNumber phDiff = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5556").build();
assertEquals(ph, phSame);
assertEquals(ph.hashCode(), phSame.hashCode());
@@ -998,11 +987,11 @@
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("8885555", "+1", "888").build();
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("8885555").countryCode("+1").areaCode("888").build();
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5556", "+1", "888").build();
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-6666").countryCode("+1").areaCode("888").build();
assertEquals(localPh, localPhSame);
assertEquals(localPh.hashCode(), localPhSame.hashCode());
@@ -1012,15 +1001,15 @@
@Test
public void test_equalsAndHashCode_extension() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.extension("12(34)")
.build();
- PhoneNumber phSame = new GlobalPhoneNumberBuilder("+18888885555")
+ PhoneNumber phSame = new GlobalPhoneNumberBuilder().globalNumber("+18888885555")
.extension("1234")
.build();
- PhoneNumber phDiff = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phDiff = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.extension("1235")
.build();
@@ -1030,15 +1019,15 @@
assertNotEquals(ph.hashCode(), phDiff.hashCode());
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.extension("12(34)")
.build();
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("8885555", "+1", "888")
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("8885555").countryCode("+1").areaCode("888")
.extension("1234")
.build();
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.extension("1235")
.build();
@@ -1050,15 +1039,15 @@
@Test
public void test_equalsAndHashCode_subAddress() throws PhoneNumberParseException {
- PhoneNumber ph = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber ph = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.subAddress("example.ZXC.com")
.build();
- PhoneNumber phSame = new GlobalPhoneNumberBuilder("+18888885555")
+ PhoneNumber phSame = new GlobalPhoneNumberBuilder().globalNumber("+18888885555")
.subAddress("Example.zxc.com")
.build();
- PhoneNumber phDiff = new GlobalPhoneNumberBuilder("+1-888-888-5555")
+ PhoneNumber phDiff = new GlobalPhoneNumberBuilder().globalNumber("+1-888-888-5555")
.subAddress("example.zxc.gov")
.build();
@@ -1068,15 +1057,15 @@
assertNotEquals(ph.hashCode(), phDiff.hashCode());
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.subAddress("example.ZXC.com")
.build();
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("8885555", "+1", "888")
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("8885555").countryCode("+1").areaCode("888")
.subAddress("Example.zxc.com")
.build();
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.subAddress("example.zxc.gov")
.build();
@@ -1088,64 +1077,52 @@
@Test
public void test_equalsAndHashCode_phoneContext_as_domainName() throws PhoneNumberParseException {
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "example.ZXC.com").build();
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").domainName("example.ZXC.com").build();
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("8885555", "Example.zxc.com").build();
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("8885555").domainName("Example.zxc.com").build();
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "example.zxc.gov").build();
-
- PhoneNumber nullContextPh = new LocalPhoneNumberBuilder("888-5555", "example.ZXC.com").build();
- nullContextPh.setPhoneContext(null);
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").domainName("example.zxc.gov").build();
assertEquals(localPh, localPhSame);
assertEquals(localPh.hashCode(), localPhSame.hashCode());
assertNotEquals(localPh, localPhDiff);
assertNotEquals(localPh.hashCode(), localPhDiff.hashCode());
-
- assertNotEquals(localPh, nullContextPh);
- assertNotEquals(localPh.hashCode(), nullContextPh.hashCode());
}
@Test
public void test_equalsAndHashCode_phoneContext_as_digits() throws PhoneNumberParseException {
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "+1", "886").build();
-
- PhoneNumber nullContextPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
- nullContextPh.setPhoneContext(null);
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("886").build();
assertEquals(localPh, localPhSame);
assertEquals(localPh.hashCode(), localPhSame.hashCode());
assertNotEquals(localPh, localPhDiff);
assertNotEquals(localPh.hashCode(), localPhDiff.hashCode());
-
- assertNotEquals(localPh, nullContextPh);
- assertNotEquals(localPh.hashCode(), nullContextPh.hashCode());
}
@Test
public void test_equalsAndHashCode_params() throws PhoneNumberParseException {
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.param("A","c")
.param("B","d")
.build();
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.param("a","C")
.param("b","D")
.build();
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "+1", "888")
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888")
.param("A","e")
.param("B","d")
.build();
- PhoneNumber nullParamsPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber nullParamsPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
assertEquals(localPh, localPhSame);
assertEquals(localPh.hashCode(), localPhSame.hashCode());
@@ -1156,22 +1133,22 @@
assertNotEquals(localPh, nullParamsPh);
assertNotEquals(localPh.hashCode(), nullParamsPh.hashCode());
- PhoneNumber globalPh = new GlobalPhoneNumberBuilder("+683-5791")
+ PhoneNumber globalPh = new GlobalPhoneNumberBuilder().globalNumber("+683-5791")
.param("A","c")
.param("B","d")
.build();
- PhoneNumber globalPhSame = new GlobalPhoneNumberBuilder("+683-5791")
+ PhoneNumber globalPhSame = new GlobalPhoneNumberBuilder().globalNumber("+683-5791")
.param("a","C")
.param("b","D")
.build();
- PhoneNumber globalPhDiff = new GlobalPhoneNumberBuilder("+683-5791")
+ PhoneNumber globalPhDiff = new GlobalPhoneNumberBuilder().globalNumber("+683-5791")
.param("A","e")
.param("f","D")
.build();
- PhoneNumber nullParamsGlobalPh = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber nullParamsGlobalPh = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
assertEquals(globalPh, globalPhSame);
assertEquals(globalPh.hashCode(), globalPhSame.hashCode());
@@ -1185,16 +1162,16 @@
@Test
public void test_equalsAndHashCode_phoneContext_primary_flag() throws PhoneNumberParseException {
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
localPh.setPrimary(Boolean.TRUE);
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
localPhSame.setPrimary(Boolean.TRUE);
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
localPhDiff.setPrimary(Boolean.FALSE);
- PhoneNumber nullPrimaryPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber nullPrimaryPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
nullPrimaryPh.setPrimary(null);
assertEquals(localPh, localPhSame);
@@ -1207,16 +1184,16 @@
assertNotEquals(localPh.hashCode(), nullPrimaryPh.hashCode());
- PhoneNumber globalPh = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber globalPh = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
globalPh.setPrimary(true);
- PhoneNumber globalPhSame = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber globalPhSame = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
globalPhSame.setPrimary(true);
- PhoneNumber globalPhDiff = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber globalPhDiff = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
globalPhDiff.setPrimary(false);
- PhoneNumber nullPrimaryGlobalPh = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber nullPrimaryGlobalPh = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
nullPrimaryGlobalPh.setPrimary(null);
assertEquals(globalPh, globalPhSame);
@@ -1231,16 +1208,16 @@
@Test
public void test_equalsAndHashCode_phoneContext_type() throws PhoneNumberParseException {
- PhoneNumber localPh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
localPh.setType("work");
- PhoneNumber localPhSame = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPhSame = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
localPhSame.setType("WORK");
- PhoneNumber localPhDiff = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber localPhDiff = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
localPhDiff.setType("HOME");
- PhoneNumber nullTypePh = new LocalPhoneNumberBuilder("888-5555", "+1", "888").build();
+ PhoneNumber nullTypePh = new LocalPhoneNumberBuilder().subscriberNumber("888-5555").countryCode("+1").areaCode("888").build();
assertNull(nullTypePh.getType());
assertEquals(localPh, localPhSame);
@@ -1253,16 +1230,16 @@
assertNotEquals(localPh.hashCode(), nullTypePh.hashCode());
- PhoneNumber globalPh = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber globalPh = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
globalPh.setType("mobile");
- PhoneNumber globalPhSame = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber globalPhSame = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
globalPhSame.setType("MOBILE");
- PhoneNumber globalPhDiff = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber globalPhDiff = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
globalPhDiff.setType("fax");
- PhoneNumber nullTypeGlobalPh = new GlobalPhoneNumberBuilder("+683-5791").build();
+ PhoneNumber nullTypeGlobalPh = new GlobalPhoneNumberBuilder().globalNumber("+683-5791").build();
assertNull(nullTypeGlobalPh.getType());
assertEquals(globalPh, globalPhSame);
diff --git a/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberJsonTest.java b/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberJsonTest.java
new file mode 100644
index 0000000..7141ba7
--- /dev/null
+++ b/scim-spec/scim-spec-schema/src/test/java/edu/psu/swe/scim/spec/resources/PhoneNumberJsonTest.java
@@ -0,0 +1,64 @@
+package edu.psu.swe.scim.spec.resources;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class PhoneNumberJsonTest {
+
+ @Test
+ public void testPhoneNumberJson() throws Exception {
+ PhoneNumber phoneNumber = new PhoneNumber();
+ phoneNumber.setValue("tel:+12083869507");
+
+ ObjectMapper objectMapper = getObjectMapper();
+
+ String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(phoneNumber);
+
+ log.info(json);
+
+ PhoneNumber readValue = objectMapper.readValue(json, PhoneNumber.class);
+
+ Assert.assertEquals(phoneNumber.getNumber(), readValue.getNumber());
+ Assert.assertEquals(phoneNumber.getExtension(), readValue.getExtension());
+ Assert.assertEquals(phoneNumber.isDomainPhoneContext(), readValue.isDomainPhoneContext());
+ Assert.assertEquals(phoneNumber.isGlobalNumber(), readValue.isGlobalNumber());
+ Assert.assertEquals(phoneNumber.getPhoneContext(), readValue.getPhoneContext());
+ Assert.assertEquals(phoneNumber.getSubAddress(), readValue.getSubAddress());
+ Assert.assertEquals(phoneNumber.getPrimary(), readValue.getPrimary());
+ Assert.assertEquals(phoneNumber.getDisplay(), readValue.getDisplay());
+ Assert.assertEquals(phoneNumber.getType(), readValue.getType());
+ Assert.assertEquals(phoneNumber.getValue(), readValue.getValue());
+
+
+ log.info("done");
+ }
+
+ private ObjectMapper getObjectMapper() {
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ JaxbAnnotationModule jaxbAnnotationModule = new JaxbAnnotationModule();
+ objectMapper.registerModule(jaxbAnnotationModule);
+ objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+ AnnotationIntrospector jaxbIntrospector = new JaxbAnnotationIntrospector(objectMapper.getTypeFactory());
+ AnnotationIntrospector jacksonIntrospector = new JacksonAnnotationIntrospector();
+ AnnotationIntrospector pair = new AnnotationIntrospectorPair(jaxbIntrospector, jacksonIntrospector);
+ objectMapper.setAnnotationIntrospector(pair);
+
+ objectMapper.setSerializationInclusion(Include.NON_NULL);
+ return objectMapper;
+ }
+
+}
diff --git a/scim-tools/pom.xml b/scim-tools/pom.xml
index c7c7caa..84bd85e 100644
--- a/scim-tools/pom.xml
+++ b/scim-tools/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-tools</artifactId>
diff --git a/scim-tools/scim-tools-cli/pom.xml b/scim-tools/scim-tools-cli/pom.xml
index a926ac2..611efd0 100644
--- a/scim-tools/scim-tools-cli/pom.xml
+++ b/scim-tools/scim-tools-cli/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-tools</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-tools-cli</artifactId>
diff --git a/scim-tools/scim-tools-common/pom.xml b/scim-tools/scim-tools-common/pom.xml
index 8ee9b97..d72c4b6 100644
--- a/scim-tools/scim-tools-common/pom.xml
+++ b/scim-tools/scim-tools-common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-tools</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-tools-common</artifactId>
diff --git a/scim-tools/scim-tools-studio/pom.xml b/scim-tools/scim-tools-studio/pom.xml
index ffdbd82..35e5b64 100644
--- a/scim-tools/scim-tools-studio/pom.xml
+++ b/scim-tools/scim-tools-studio/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edu.psu.swe.scim</groupId>
<artifactId>scim-tools</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</parent>
<artifactId>scim-tools-studio</artifactId>
