commit | 22ed443451f68357f34eb44bf7d4f9fcaf266ea9 | [log] [tgz] |
---|---|---|
author | Alex Haskell <aph12@psu.edu> | Wed May 18 15:08:58 2016 -0400 |
committer | Alex Haskell <aph12@psu.edu> | Wed May 18 15:11:12 2016 -0400 |
tree | 2feb7bb6564b589232ad866b691512cd4086e8b8 | |
parent | f5c35998a6e20542f38beddad957ad3adcbeed8b [diff] |
Cleaned up InMemory* create() methods
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryGroupService.java b/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryGroupService.java index 3d63c2b..4981bf9 100644 --- a/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryGroupService.java +++ b/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryGroupService.java
@@ -25,13 +25,12 @@ @Override public ScimGroup create(ScimGroup resource) { String resourceId = resource.getId(); - int resourceHashCode = resource.hashCode(); - String id = resourceId != null ? resourceId : Integer.toString(resource.hashCode()); - int offset = 1; + int idCandidate = resource.hashCode(); + String id = resourceId != null ? resourceId : Integer.toString(idCandidate); while (groups.containsKey(id)) { - id = Integer.toString(resourceHashCode + offset); - offset += 1; + id = Integer.toString(idCandidate); + ++idCandidate; } groups.put(id, resource); resource.setId(id);
diff --git a/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryUserService.java b/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryUserService.java index 66ec2c7..a572a43 100644 --- a/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryUserService.java +++ b/scim-server/scim-server-example/scim-server-memory/src/main/java/edu/psu/swe/scim/memory/service/InMemoryUserService.java
@@ -72,13 +72,12 @@ @Override public ScimUser create(ScimUser resource) { String resourceId = resource.getId(); - int resourceHashCode = resource.hashCode(); - String id = resourceId != null ? resourceId : Integer.toString(resourceHashCode); - int offset = 1; + int idCandidate = resource.hashCode(); + String id = resourceId != null ? resourceId : Integer.toString(idCandidate); while (users.containsKey(id)) { - id = Integer.toString(resourceHashCode + offset); - offset += 1; + id = Integer.toString(idCandidate); + ++idCandidate; } users.put(id, resource); resource.setId(id);