Merge pull request #632 from apache/add-404-its

Add tests for 404 when updating SCIM resources
apache · Sep 13, 2024 · 111c1c3 · 111c1c3
2 parents c81c577 + fb090a2
commit 111c1c3
Show file tree

Hide file tree

Showing 15 changed files with 253 additions and 34 deletions.
diff --git a/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/GroupsIT.java b/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/GroupsIT.java
@@ -213,6 +213,41 @@ public void updateGroupWithPatch() {
       );
   }
 
+  @Test
+  @DisplayName("Update Invalid Group")
+  void updateInvalidGroup() {
+
+    String id = randomName("group-invalidGroup-id");
+    String groupName = randomName("group-invalidGroup");
+
+    String updatedBody = "{" +
+      "\"schemas\": [\"urn:ietf:params:scim:schemas:core:2.0:Group\"]," +
+      "\"displayName\": \"" + groupName + "\"," +
+      "\"members\": []}";
+
+    put("/Groups/" + id, updatedBody)
+      .statusCode(404)
+      .body(
+        "schemas", contains("urn:ietf:params:scim:api:messages:2.0:Error"),
+        "status", is("404"),
+        "detail", is("Resource " + id + " not found.")
+      );
+  }
+
+  @Test
+  @DisplayName("Delete Invalid Group")
+  void deleteInvalidGroup() {
+    String id = randomName("group-invalidGroup-id");
+
+    delete("/Groups/" + id)
+      .statusCode(404)
+      .body(
+        "schemas", contains("urn:ietf:params:scim:api:messages:2.0:Error"),
+        "status", is("404"),
+        "detail", is("Resource " + id + " not found.")
+      );
+  }
+
   String createUser(String name, String email) {
     String body = "{" +
       "\"schemas\":[\"urn:ietf:params:scim:schemas:core:2.0:User\"]," +

diff --git a/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/UsersIT.java b/scim-compliance-tests/src/main/java/org/apache/directory/scim/compliance/tests/UsersIT.java
@@ -248,4 +248,37 @@ public void deactivateWithPatch() {
         "active", is(false)
       );
   }
+
+  @Test
+  @DisplayName("Update Invalid User")
+  void updateInvalidUser() {
+    String id = randomName("user-invalidGroup-id");
+
+    String updatedBody = "{" +
+      "\"schemas\":[\"urn:ietf:params:scim:schemas:core:2.0:User\"]," +
+      "\"active\":true" +
+      "}";
+
+    put("/Users/" + id, updatedBody)
+      .statusCode(404)
+      .body(
+        "schemas", contains("urn:ietf:params:scim:api:messages:2.0:Error"),
+        "status", is("404"),
+        "detail", is("Resource " + id + " not found.")
+      );
+  }
+
+  @Test
+  @DisplayName("Delete Invalid Users")
+  void deleteInvalidUser() {
+    String id = randomName("user-invalidGroup-id");
+
+    delete("/Users/" + id)
+      .statusCode(404)
+      .body(
+        "schemas", contains("urn:ietf:params:scim:api:messages:2.0:Error"),
+        "status", is("404"),
+        "detail", is("Resource " + id + " not found.")
+      );
+  }
 }
diff --git a/.../src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryGroupService.java b/.../src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryGroupService.java
@@ -20,17 +20,21 @@
 package org.apache.directory.scim.example.jersey.service;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import jakarta.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.directory.scim.core.repository.ETag;
 import org.apache.directory.scim.core.repository.PatchHandler;
-import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.core.repository.Repository;
+import org.apache.directory.scim.core.schema.SchemaRegistry;
+import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.spec.exception.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceNotFoundException;
+import org.apache.directory.scim.spec.filter.Filter;
 import org.apache.directory.scim.spec.filter.FilterExpressions;
 import org.apache.directory.scim.spec.filter.FilterResponse;
-import org.apache.directory.scim.spec.filter.Filter;
 import org.apache.directory.scim.spec.filter.PageRequest;
 import org.apache.directory.scim.spec.filter.SortRequest;
 import org.apache.directory.scim.spec.filter.attribute.AttributeReference;
@@ -46,10 +50,6 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Named;
-import org.apache.directory.scim.core.schema.SchemaRegistry;
-
 @Named
 @ApplicationScoped
 public class InMemoryGroupService implements Repository<ScimGroup> {
@@ -106,12 +106,20 @@ public ScimGroup create(ScimGroup resource) throws UnableToCreateResourceExcepti
 
   @Override
   public ScimGroup update(String id, Set<ETag> etags, ScimGroup resource, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!groups.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
+
     groups.put(id, resource);
     return resource;
   }
 
   @Override
   public ScimGroup patch(String id, Set<ETag> etags, List<PatchOperation> patchOperations, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!groups.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
+
     ScimGroup resource = patchHandler.apply(get(id), patchOperations);
     groups.put(id, resource);
     return resource;
@@ -123,8 +131,10 @@ public ScimGroup get(String id) {
   }
 
   @Override
-  public void delete(String id) {
-    groups.remove(id);
+  public void delete(String id) throws ResourceException {
+    if (groups.remove(id) == null) {
+      throw new ResourceNotFoundException(id);
+    }
   }
 
   @Override

diff --git a/...y/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryUserService.java b/...y/src/main/java/org/apache/directory/scim/example/jersey/service/InMemoryUserService.java
@@ -31,6 +31,7 @@
 import org.apache.directory.scim.example.jersey.extensions.LuckyNumberExtension;
 import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.spec.exception.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceNotFoundException;
 import org.apache.directory.scim.spec.extension.EnterpriseExtension;
 import org.apache.directory.scim.spec.filter.Filter;
 import org.apache.directory.scim.spec.filter.FilterExpressions;
@@ -142,12 +143,18 @@ public ScimUser create(ScimUser resource) throws UnableToCreateResourceException
 
   @Override
   public ScimUser update(String id, Set<ETag> etags, ScimUser resource, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!users.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     users.put(id, resource);
     return resource;
   }
 
   @Override
   public ScimUser patch(String id, Set<ETag> etags, List<PatchOperation> patchOperations, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!users.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     ScimUser resource = patchHandler.apply(get(id), patchOperations);
     users.put(id, resource);
     return resource;
@@ -166,8 +173,10 @@ public ScimUser get(String id) {
    * @see Repository#delete(java.lang.String)
    */
   @Override
-  public void delete(String id) {
-    users.remove(id);
+  public void delete(String id) throws ResourceException {
+    if (users.remove(id) == null) {
+      throw new ResourceNotFoundException(id);
+    }
   }
 
   /**

diff --git a/.../src/main/java/org/apache/directory/scim/example/memory/service/InMemoryGroupService.java b/.../src/main/java/org/apache/directory/scim/example/memory/service/InMemoryGroupService.java
@@ -28,6 +28,7 @@
 import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.core.repository.Repository;
 import org.apache.directory.scim.spec.exception.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceNotFoundException;
 import org.apache.directory.scim.spec.filter.FilterExpressions;
 import org.apache.directory.scim.spec.filter.FilterResponse;
 import org.apache.directory.scim.spec.filter.Filter;
@@ -106,12 +107,18 @@ public ScimGroup create(ScimGroup resource) throws UnableToCreateResourceExcepti
 
   @Override
   public ScimGroup update(String id, Set<ETag> etags, ScimGroup resource, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!groups.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     groups.put(id, resource);
     return resource;
   }
 
   @Override
   public ScimGroup patch(String id, Set<ETag> etags, List<PatchOperation> patchOperations, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!groups.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     ScimGroup resource = patchHandler.apply(get(id), patchOperations);
     groups.put(id, resource);
     return resource;
@@ -123,8 +130,10 @@ public ScimGroup get(String id) {
   }
 
   @Override
-  public void delete(String id) {
-    groups.remove(id);
+  public void delete(String id) throws ResourceException {
+    if (groups.remove(id) == null) {
+      throw new ResourceNotFoundException(id);
+    }
   }
 
   @Override

diff --git a/...y/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryUserService.java b/...y/src/main/java/org/apache/directory/scim/example/memory/service/InMemoryUserService.java
@@ -31,6 +31,7 @@
 import org.apache.directory.scim.example.memory.extensions.LuckyNumberExtension;
 import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.spec.exception.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceNotFoundException;
 import org.apache.directory.scim.spec.extension.EnterpriseExtension;
 import org.apache.directory.scim.spec.filter.Filter;
 import org.apache.directory.scim.spec.filter.FilterExpressions;
@@ -142,12 +143,18 @@ public ScimUser create(ScimUser resource) throws UnableToCreateResourceException
 
   @Override
   public ScimUser update(String id, Set<ETag> etags, ScimUser resource, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!users.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     users.put(id, resource);
     return resource;
   }
 
   @Override
   public ScimUser patch(String id, Set<ETag> etags, List<PatchOperation> patchOperations, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!users.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     ScimUser resource = patchHandler.apply(get(id), patchOperations);
     users.put(id, resource);
     return resource;
@@ -165,8 +172,10 @@ public ScimUser get(String id) {
    * @see Repository#delete(java.lang.String)
    */
   @Override
-  public void delete(String id) {
-    users.remove(id);
+  public void delete(String id) throws ResourceException {
+    if (users.remove(id) == null) {
+      throw new ResourceNotFoundException(id);
+    }
   }
 
   /**

diff --git a/...src/main/java/org/apache/directory/scim/example/quarkus/service/InMemoryGroupService.java b/...src/main/java/org/apache/directory/scim/example/quarkus/service/InMemoryGroupService.java
@@ -31,6 +31,7 @@
 import org.apache.directory.scim.core.schema.SchemaRegistry;
 import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.spec.exception.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceNotFoundException;
 import org.apache.directory.scim.spec.filter.Filter;
 import org.apache.directory.scim.spec.filter.FilterExpressions;
 import org.apache.directory.scim.spec.filter.FilterResponse;
@@ -105,12 +106,18 @@ public ScimGroup create(ScimGroup resource) throws UnableToCreateResourceExcepti
 
   @Override
   public ScimGroup update(String id, Set<ETag> etags, ScimGroup resource, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!groups.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     groups.put(id, resource);
     return resource;
   }
 
   @Override
   public ScimGroup patch(String id, Set<ETag> etags, List<PatchOperation> patchOperations, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!groups.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     ScimGroup resource = patchHandler.apply(get(id), patchOperations);
     groups.put(id, resource);
     return resource;
@@ -122,8 +129,10 @@ public ScimGroup get(String id) {
   }
 
   @Override
-  public void delete(String id) {
-    groups.remove(id);
+  public void delete(String id) throws ResourceException {
+    if (groups.remove(id) == null) {
+      throw new ResourceNotFoundException(id);
+    }
   }
 
   @Override

diff --git a/.../src/main/java/org/apache/directory/scim/example/quarkus/service/InMemoryUserService.java b/.../src/main/java/org/apache/directory/scim/example/quarkus/service/InMemoryUserService.java
@@ -31,6 +31,7 @@
 import org.apache.directory.scim.example.quarkus.extensions.LuckyNumberExtension;
 import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
 import org.apache.directory.scim.spec.exception.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceNotFoundException;
 import org.apache.directory.scim.spec.extension.EnterpriseExtension;
 import org.apache.directory.scim.spec.filter.Filter;
 import org.apache.directory.scim.spec.filter.FilterExpressions;
@@ -142,12 +143,18 @@ public ScimUser create(ScimUser resource) throws UnableToCreateResourceException
 
   @Override
   public ScimUser update(String id, Set<ETag> etags, ScimUser resource, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!users.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     users.put(id, resource);
     return resource;
   }
 
   @Override
   public ScimUser patch(String id, Set<ETag> etags, List<PatchOperation> patchOperations, Set<AttributeReference> includedAttributeReferences, Set<AttributeReference> excludedAttributeReferences) throws ResourceException {
+    if (!users.containsKey(id)) {
+      throw new ResourceNotFoundException(id);
+    }
     ScimUser resource = patchHandler.apply(get(id), patchOperations);
     users.put(id, resource);
     return resource;
@@ -165,8 +172,10 @@ public ScimUser get(String id) {
    * @see Repository#delete(java.lang.String)
    */
   @Override
-  public void delete(String id) {
-    users.remove(id);
+  public void delete(String id) throws ResourceException {
+    if (users.remove(id) == null) {
+      throw new ResourceNotFoundException(id);
+    }
   }
 
   /**