[syncope] 02/02: [SYNCOPE-1625] Fix Payara build

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit bf197b2b4c69bd728133742d89f6fa45e5724e2d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Apr 6 08:45:13 2021 +0200

    [SYNCOPE-1625] Fix Payara build
---
 .../syncope/common/rest/api/service/wa/ImpersonationService.java   | 3 ++-
 .../syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java | 4 ++--
 .../java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java   | 2 +-
 .../org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java    | 7 +++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java
index 8ecac7c..67ac6d4 100644
--- a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java
+++ b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/wa/ImpersonationService.java
@@ -68,9 +68,10 @@ public interface ImpersonationService extends JAXRSService {
     Response create(@NotNull ImpersonationAccount account);
 
     @DELETE
+    @Path("accounts/{owner}")
     @Consumes({ MediaType.APPLICATION_JSON, RESTHeaders.APPLICATION_YAML, MediaType.APPLICATION_XML })
     @Produces({ MediaType.APPLICATION_JSON, RESTHeaders.APPLICATION_YAML, MediaType.APPLICATION_XML })
-    Response delete(@NotNull ImpersonationAccount account);
+    Response delete(@NotNull @PathParam("owner") String owner, @NotNull @QueryParam("id") String id);
 
     @ApiResponses(
         @ApiResponse(responseCode = "204", description = "Operation was successful"))
diff --git a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java
index 17b7e88..1d79c77 100644
--- a/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java
+++ b/core/am/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/wa/ImpersonationServiceImpl.java
@@ -56,8 +56,8 @@ public class ImpersonationServiceImpl extends AbstractServiceImpl implements Imp
     }
 
     @Override
-    public Response delete(final ImpersonationAccount account) {
-        logic.delete(account);
+    public Response delete(final String owner, final String id) {
+        logic.delete(logic.find(owner, id));
         return Response.noContent().build();
     }
 
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java
index 71e1706..752a390 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/wa/ImpersonationITCase.java
@@ -51,7 +51,7 @@ public class ImpersonationITCase extends AbstractITCase {
         account = impersonationService.find(account.getOwner(), account.getKey());
         assertNotNull(account);
 
-        response = impersonationService.delete(account);
+        response = impersonationService.delete(account.getOwner(), account.getKey());
         assertNotNull(response);
         
         try {
diff --git a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java
index c77e4c4..7aa974b 100644
--- a/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java
+++ b/wa/starter/src/test/java/org/apache/syncope/wa/starter/SyncopeCoreTestingServer.java
@@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
-import javax.validation.constraints.NotNull;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.core.Response;
 
@@ -133,9 +132,9 @@ public class SyncopeCoreTestingServer implements ApplicationListener<ContextRefr
         }
 
         @Override
-        public Response delete(final ImpersonationAccount account) {
-            if (accounts.containsKey(account.getOwner())) {
-                accounts.get(account.getOwner()).removeIf(acct -> acct.getKey().equalsIgnoreCase(account.getKey()));
+        public Response delete(final String owner, final String id) {
+            if (accounts.containsKey(owner)) {
+                accounts.get(owner).removeIf(acct -> acct.getKey().equalsIgnoreCase(id));
             }
             return Response.noContent().build();
         }