You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bd...@apache.org on 2022/09/07 22:55:57 UTC
[directory-scimple] 01/01: Move ResourceException to spec package so it can be used by protocol
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch move-resource-exception
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
commit a98b402143685023d84a8dec331542ef2d3bbf27
Author: Brian Demers <bd...@apache.org>
AuthorDate: Wed Sep 7 18:55:11 2022 -0400
Move ResourceException to spec package so it can be used by protocol
---
.../directory/scim/core/repository/Repository.java | 1 +
.../scim/core/repository/RepositoryRegistry.java | 1 +
.../scim/core/repository/SelfIdResolver.java | 2 ++
.../exception/UnableToCreateResourceException.java | 2 +-
.../exception/UnableToDeleteResourceException.java | 2 +-
.../UnableToResolveIdResourceException.java | 2 +-
...nableToRetrieveExtensionsResourceException.java | 2 +-
.../UnableToRetrieveResourceException.java | 2 +-
.../exception/UnableToUpdateResourceException.java | 2 +-
.../scim/server/rest/BulkResourceImpl.java | 2 +-
.../scim/server/rest/SelfResourceImpl.java | 2 +-
.../scim/server/rest/SelfResourceImplTest.java | 2 +-
.../spec/exception/ConflictResourceException.java | 31 ++++++++++++++++++++++
.../scim/spec/exception}/ResourceException.java | 2 +-
14 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/scim-core/src/main/java/org/apache/directory/scim/core/repository/Repository.java b/scim-core/src/main/java/org/apache/directory/scim/core/repository/Repository.java
index 646886fd..36283801 100644
--- a/scim-core/src/main/java/org/apache/directory/scim/core/repository/Repository.java
+++ b/scim-core/src/main/java/org/apache/directory/scim/core/repository/Repository.java
@@ -21,6 +21,7 @@ package org.apache.directory.scim.core.repository;
import java.util.List;
+import org.apache.directory.scim.spec.exception.ResourceException;
import org.apache.directory.scim.spec.filter.FilterResponse;
import org.apache.directory.scim.spec.filter.Filter;
import org.apache.directory.scim.spec.filter.PageRequest;
diff --git a/scim-core/src/main/java/org/apache/directory/scim/core/repository/RepositoryRegistry.java b/scim-core/src/main/java/org/apache/directory/scim/core/repository/RepositoryRegistry.java
index 21e47029..19bf1490 100644
--- a/scim-core/src/main/java/org/apache/directory/scim/core/repository/RepositoryRegistry.java
+++ b/scim-core/src/main/java/org/apache/directory/scim/core/repository/RepositoryRegistry.java
@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.directory.scim.core.Initializable;
import org.apache.directory.scim.spec.annotation.ScimExtensionType;
import org.apache.directory.scim.spec.annotation.ScimResourceType;
+import org.apache.directory.scim.spec.exception.ResourceException;
import org.apache.directory.scim.spec.exception.ScimResourceInvalidException;
import org.apache.directory.scim.spec.extension.ScimExtensionRegistry;
import org.apache.directory.scim.spec.resources.ScimExtension;
diff --git a/scim-core/src/main/java/org/apache/directory/scim/core/repository/SelfIdResolver.java b/scim-core/src/main/java/org/apache/directory/scim/core/repository/SelfIdResolver.java
index 62459942..cf431404 100644
--- a/scim-core/src/main/java/org/apache/directory/scim/core/repository/SelfIdResolver.java
+++ b/scim-core/src/main/java/org/apache/directory/scim/core/repository/SelfIdResolver.java
@@ -19,6 +19,8 @@
package org.apache.directory.scim.core.repository;
+import org.apache.directory.scim.spec.exception.ResourceException;
+
import java.security.Principal;
public interface SelfIdResolver {
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java
index be83d53e..9cb022ba 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToCreateResourceException.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Response.Status;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
@Data
@EqualsAndHashCode(callSuper=true)
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java
index d332fc62..b676c6f6 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToDeleteResourceException.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Response.Status;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
@Data
@EqualsAndHashCode(callSuper=true)
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java
index cacae1b4..a672e12f 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToResolveIdResourceException.java
@@ -23,7 +23,7 @@ package org.apache.directory.scim.server.exception;
import jakarta.ws.rs.core.Response.Status;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
@Data
@EqualsAndHashCode(callSuper=true)
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java
index edf646da..b1bca555 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveExtensionsResourceException.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Response.Status;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
@Data
@EqualsAndHashCode(callSuper=true)
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java
index 3c1c8bb7..4038a2f7 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToRetrieveResourceException.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Response.Status;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
@Data
@EqualsAndHashCode(callSuper=true)
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java
index 075d0856..b874ee8b 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/exception/UnableToUpdateResourceException.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Response.Status;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
@Data
@EqualsAndHashCode(callSuper=true)
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java
index 482c288f..6aa6eb42 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/rest/BulkResourceImpl.java
@@ -29,7 +29,7 @@ import jakarta.ws.rs.core.Response.Status;
import jakarta.ws.rs.core.UriInfo;
import org.apache.commons.lang3.StringUtils;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
import org.apache.directory.scim.server.exception.UnableToCreateResourceException;
import org.apache.directory.scim.server.exception.UnableToDeleteResourceException;
import org.apache.directory.scim.server.exception.UnableToRetrieveResourceException;
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java b/scim-server/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
index a8ed01fe..32db8deb 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
@@ -27,7 +27,7 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
import org.apache.directory.scim.server.exception.UnableToResolveIdResourceException;
import org.apache.directory.scim.core.repository.SelfIdResolver;
import org.apache.directory.scim.protocol.SelfResource;
diff --git a/scim-server/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
index 3c20e3c2..619c751b 100644
--- a/scim-server/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
+++ b/scim-server/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
@@ -33,7 +33,7 @@ import jakarta.enterprise.inject.Instance;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.SecurityContext;
-import org.apache.directory.scim.core.repository.ResourceException;
+import org.apache.directory.scim.spec.exception.ResourceException;
import org.apache.directory.scim.core.repository.SelfIdResolver;
import org.apache.directory.scim.protocol.UserResource;
import org.apache.directory.scim.protocol.data.ErrorResponse;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/exception/ConflictResourceException.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/exception/ConflictResourceException.java
new file mode 100644
index 00000000..91af8d96
--- /dev/null
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/exception/ConflictResourceException.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.directory.scim.spec.exception;
+
+public class ConflictResourceException extends ResourceException {
+
+ public ConflictResourceException(String message) {
+ super(409, message);
+ }
+
+ public ConflictResourceException(int statusCode, String message, Throwable cause) {
+ super(409, message, cause);
+ }
+}
diff --git a/scim-core/src/main/java/org/apache/directory/scim/core/repository/ResourceException.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/exception/ResourceException.java
similarity index 95%
rename from scim-core/src/main/java/org/apache/directory/scim/core/repository/ResourceException.java
rename to scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/exception/ResourceException.java
index 0a987635..d5358877 100644
--- a/scim-core/src/main/java/org/apache/directory/scim/core/repository/ResourceException.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/exception/ResourceException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.directory.scim.core.repository;
+package org.apache.directory.scim.spec.exception;
import lombok.Data;
import lombok.EqualsAndHashCode;