Switching back return types for v1 service

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java
index bbd656a9354eba262346debd0d1f534b37653888..67f44ee0969b828913d849f58d83544bd50f8a38 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RedbackRuntimeConfigurationService.java
@@ -22,7 +22,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.archiva.admin.model.beans.LdapConfiguration;
 import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
 import org.apache.archiva.redback.authorization.RedbackAuthorization;
-import org.apache.archiva.rest.api.model.ActionStatus;
 import org.apache.archiva.rest.api.model.RBACManagerImplementationInformation;
 import org.apache.archiva.rest.api.model.RedbackImplementationsInformations;
 import org.apache.archiva.rest.api.model.UserManagerImplementationInformation;
@@ -57,7 +56,7 @@ public interface RedbackRuntimeConfigurationService
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION)
-    ActionStatus updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
+    Boolean updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
         throws ArchivaRestServiceException;
 
     @Path("userManagerImplementationInformations")
@@ -86,7 +85,7 @@ public interface RedbackRuntimeConfigurationService
     @GET
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
     @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
-    ActionStatus checkLdapConnection()
+    Boolean checkLdapConnection()
         throws ArchivaRestServiceException;
 
     @Path("checkLdapConnection")
@@ -94,6 +93,6 @@ public interface RedbackRuntimeConfigurationService
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION)
-    ActionStatus checkLdapConnection( LdapConfiguration ldapConfiguration )
+    Boolean checkLdapConnection( LdapConfiguration ldapConfiguration )
         throws ArchivaRestServiceException;
 }

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index c45b1da2f564e582a4b23e46947ebef2f67dc0e7..060de9ba3b48d224714938b6a059b67cb91a9a65 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -113,7 +113,7 @@ public class DefaultRedbackRuntimeConfigurationService
     }
 
     @Override
-    public ActionStatus updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
+    public Boolean updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration redbackRuntimeConfiguration )
         throws ArchivaRestServiceException
     {
         try
@@ -222,7 +222,7 @@ public class DefaultRedbackRuntimeConfigurationService
             }
 
 
-            return ActionStatus.SUCCESS;
+            return Boolean.TRUE;
         }
         catch (ArchivaRestServiceException e) {
             log.error(e.getMessage(), e);
@@ -302,7 +302,7 @@ public class DefaultRedbackRuntimeConfigurationService
     }
 
     @Override
-    public ActionStatus checkLdapConnection()
+    public Boolean checkLdapConnection()
         throws ArchivaRestServiceException
     {
         LdapConnection ldapConnection = null;
@@ -324,11 +324,11 @@ public class DefaultRedbackRuntimeConfigurationService
             }
         }
 
-        return ActionStatus.SUCCESS;
+        return Boolean.TRUE;
     }
 
     @Override
-    public ActionStatus checkLdapConnection( LdapConfiguration ldapConfiguration )
+    public Boolean checkLdapConnection( LdapConfiguration ldapConfiguration )
         throws ArchivaRestServiceException
     {
         LdapConnection ldapConnection = null;
@@ -379,7 +379,7 @@ public class DefaultRedbackRuntimeConfigurationService
             }
         }
 
-        return ActionStatus.SUCCESS;
+        return Boolean.TRUE;
     }
 
     private Properties toProperties( Map<String, String> map )