This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit d4b3b087fd1fb01d41b2d85b061cf5999fd2a1d8 Author: Martin Stockhammer <[email protected]> AuthorDate: Fri Jan 1 19:00:03 2021 +0100 Moving rest utility classes to components --- idea.run.configuration/All Rest Services.run.xml | 6 ------ idea.run.configuration/V2 AuthenticationServiceTest.run.xml | 6 ------ ...iva.redback.rest.services.v2 in redback-rest-services.run.xml | 6 ------ pom.xml | 5 +++++ redback-integrations/redback-rest/redback-rest-api/pom.xml | 8 ++++++-- .../org/apache/archiva/redback/rest/api/model/TokenRequest.java | 1 + .../org/apache/archiva/redback/rest/api/model/v2/GrantType.java | 3 +-- .../archiva/redback/rest/api/model/v2/TokenRefreshRequest.java | 1 - .../apache/archiva/redback/rest/api/model/v2/TokenRequest.java | 1 - .../archiva/redback/rest/api/services/v2/GroupService.java | 3 +-- .../apache/archiva/redback/rest/api/services/v2/RoleService.java | 2 +- .../apache/archiva/redback/rest/api/services/v2/UserService.java | 2 +- .../archiva/redback/rest/services/v2/BaseRedbackService.java | 3 ++- .../redback/rest/services/v2/DefaultAuthenticationService.java | 2 +- .../archiva/redback/rest/services/v2/DefaultGroupService.java | 2 +- .../archiva/redback/rest/services/v2/DefaultRoleService.java | 9 +++++---- .../archiva/redback/rest/services/v2/DefaultUserService.java | 2 +- .../redback/rest/services/v2/AuthenticationServiceTest.java | 2 +- .../archiva/redback/rest/services/v2/NativeRoleServiceTest.java | 5 +---- .../apache/archiva/redback/rest/services/v2/UserServiceTest.java | 6 +++--- 20 files changed, 31 insertions(+), 44 deletions(-) diff --git a/idea.run.configuration/All Rest Services.run.xml b/idea.run.configuration/All Rest Services.run.xml index 010200a..300691f 100644 --- a/idea.run.configuration/All Rest Services.run.xml +++ b/idea.run.configuration/All Rest Services.run.xml @@ -2,12 +2,6 @@ <configuration default="false" name="All Rest Services" type="JUnit" factoryName="JUnit" folderName="Redback"> <module name="redback-rest-services" /> <useClassPathOnly /> - <extension name="coverage"> - <pattern> - <option name="PATTERN" value="org.apache.archiva.redback.rest.api.services.v2.*" /> - <option name="ENABLED" value="true" /> - </pattern> - </extension> <option name="PACKAGE_NAME" value="org.apache.archiva.redback.rest.services" /> <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> diff --git a/idea.run.configuration/V2 AuthenticationServiceTest.run.xml b/idea.run.configuration/V2 AuthenticationServiceTest.run.xml index 116e14c..c177bd3 100644 --- a/idea.run.configuration/V2 AuthenticationServiceTest.run.xml +++ b/idea.run.configuration/V2 AuthenticationServiceTest.run.xml @@ -2,12 +2,6 @@ <configuration default="false" name="V2 AuthenticationServiceTest" type="JUnit" factoryName="JUnit"> <module name="redback-rest-services" /> <useClassPathOnly /> - <extension name="coverage"> - <pattern> - <option name="PATTERN" value="org.apache.archiva.redback.rest.api.services.v2.*" /> - <option name="ENABLED" value="true" /> - </pattern> - </extension> <option name="PACKAGE_NAME" value="org.apache.archiva.redback.rest.services.v2" /> <option name="MAIN_CLASS_NAME" value="org.apache.archiva.redback.rest.services.v2.AuthenticationServiceTest" /> <option name="METHOD_NAME" value="" /> diff --git a/idea.run.configuration/org.apache.archiva.redback.rest.services.v2 in redback-rest-services.run.xml b/idea.run.configuration/org.apache.archiva.redback.rest.services.v2 in redback-rest-services.run.xml index f4b1844..b336afe 100644 --- a/idea.run.configuration/org.apache.archiva.redback.rest.services.v2 in redback-rest-services.run.xml +++ b/idea.run.configuration/org.apache.archiva.redback.rest.services.v2 in redback-rest-services.run.xml @@ -2,12 +2,6 @@ <configuration default="false" name="All V2 Rest Services" type="JUnit" factoryName="JUnit"> <module name="redback-rest-services" /> <useClassPathOnly /> - <extension name="coverage"> - <pattern> - <option name="PATTERN" value="org.apache.archiva.redback.rest.api.services.v2.*" /> - <option name="ENABLED" value="true" /> - </pattern> - </extension> <option name="PACKAGE_NAME" value="org.apache.archiva.redback.rest.services.v2" /> <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> diff --git a/pom.xml b/pom.xml index 7798486..8bc9601 100644 --- a/pom.xml +++ b/pom.xml @@ -342,6 +342,11 @@ <version>${commons.logging.version}</version> </dependency> <dependency> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-rest-util</artifactId> + <version>${archiva.comp.version}</version> + </dependency> + <dependency> <groupId>org.apache.archiva.components.cache</groupId> <artifactId>archiva-components-spring-cache-api</artifactId> <version>${archiva.comp.version}</version> diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml b/redback-integrations/redback-rest/redback-rest-api/pom.xml index 6779dea..2b30768 100644 --- a/redback-integrations/redback-rest/redback-rest-api/pom.xml +++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml @@ -32,7 +32,8 @@ <properties> <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base> - <enunciate.docsDir>${project.build.outputDirectory}/rest-docs-redback-rest-api</enunciate.docsDir> + <openapi.config.file>${project.basedir}/src/main/resources/redback/openapi-configuration.yaml</openapi.config.file> + <openapi.prefix>redback</openapi.prefix> </properties> <dependencies> @@ -52,7 +53,10 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-model</artifactId> </dependency> - + <dependency> + <groupId>org.apache.archiva.components</groupId> + <artifactId>archiva-components-rest-util</artifactId> + </dependency> <dependency> <groupId>jakarta.ws.rs</groupId> diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/TokenRequest.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/TokenRequest.java index 3df19b2..cd21d6d 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/TokenRequest.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/TokenRequest.java @@ -19,6 +19,7 @@ package org.apache.archiva.redback.rest.api.model; */ import io.swagger.v3.oas.annotations.media.Schema; +import org.apache.archiva.redback.rest.api.model.v2.GrantType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java index 63c362a..8b0cb79 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/GrantType.java @@ -1,4 +1,4 @@ -package org.apache.archiva.redback.rest.api.model; +package org.apache.archiva.redback.rest.api.model.v2; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -10,7 +10,6 @@ package org.apache.archiva.redback.rest.api.model; * 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 diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRefreshRequest.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRefreshRequest.java index a474303..98137b3 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRefreshRequest.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRefreshRequest.java @@ -17,7 +17,6 @@ package org.apache.archiva.redback.rest.api.model.v2;/* */ import io.swagger.v3.oas.annotations.media.Schema; -import org.apache.archiva.redback.rest.api.model.GrantType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRequest.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRequest.java index 73f6ad9..7fc208d 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRequest.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/TokenRequest.java @@ -19,7 +19,6 @@ package org.apache.archiva.redback.rest.api.model.v2; */ import io.swagger.v3.oas.annotations.media.Schema; -import org.apache.archiva.redback.rest.api.model.GrantType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/GroupService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/GroupService.java index 86b87af..1797150 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/GroupService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/GroupService.java @@ -25,12 +25,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.archiva.components.rest.model.PagedResult; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.rest.api.Constants; -import org.apache.archiva.redback.rest.api.model.ActionStatus; import org.apache.archiva.redback.rest.api.model.v2.Group; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.GroupMapping; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/RoleService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/RoleService.java index a8be9ff..51d8a21 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/RoleService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/RoleService.java @@ -26,10 +26,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.archiva.components.rest.model.PagedResult; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.rest.api.model.RedbackRestError; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.Role; import org.apache.archiva.redback.rest.api.model.v2.RoleInfo; import org.apache.archiva.redback.rest.api.model.v2.RoleTemplate; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/UserService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/UserService.java index 5bb4811..edd8994 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/UserService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/v2/UserService.java @@ -28,6 +28,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.archiva.components.rest.model.PagedResult; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.rest.api.model.ActionStatus; @@ -36,7 +37,6 @@ import org.apache.archiva.redback.rest.api.model.RedbackRestError; import org.apache.archiva.redback.rest.api.model.v2.PasswordChange; import org.apache.archiva.redback.rest.api.model.v2.RoleTree; import org.apache.archiva.redback.rest.api.model.v2.AvailabilityStatus; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.Permission; import org.apache.archiva.redback.rest.api.model.v2.PingResult; import org.apache.archiva.redback.rest.api.model.v2.RegistrationKey; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/BaseRedbackService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/BaseRedbackService.java index 01fd95e..b22ad74 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/BaseRedbackService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/BaseRedbackService.java @@ -18,13 +18,14 @@ package org.apache.archiva.redback.rest.services.v2; * under the License. */ +import org.apache.archiva.components.rest.model.PagedResult; +import org.apache.archiva.components.rest.util.QueryHelper; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rest.api.MessageKeys; import org.apache.archiva.redback.rest.api.model.ErrorMessage; import org.apache.archiva.redback.rest.api.model.v2.BaseUserInfo; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.RoleInfo; import org.apache.archiva.redback.rest.api.model.v2.UserInfo; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultAuthenticationService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultAuthenticationService.java index d68f4a2..5fbd64c 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultAuthenticationService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultAuthenticationService.java @@ -31,7 +31,7 @@ import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.rest.api.MessageKeys; import org.apache.archiva.redback.rest.api.model.ErrorMessage; -import org.apache.archiva.redback.rest.api.model.GrantType; +import org.apache.archiva.redback.rest.api.model.v2.GrantType; import org.apache.archiva.redback.rest.api.model.v2.PingResult; import org.apache.archiva.redback.rest.api.model.v2.TokenRefreshRequest; import org.apache.archiva.redback.rest.api.model.v2.TokenRequest; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultGroupService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultGroupService.java index fb4072c..a2f3ec1 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultGroupService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultGroupService.java @@ -18,6 +18,7 @@ package org.apache.archiva.redback.rest.services.v2; * under the License. */ +import org.apache.archiva.components.rest.model.PagedResult; import org.apache.archiva.redback.common.ldap.MappingException; import org.apache.archiva.redback.common.ldap.ObjectNotFoundException; import org.apache.archiva.redback.common.ldap.connection.LdapConnection; @@ -30,7 +31,6 @@ import org.apache.archiva.redback.rest.api.MessageKeys; import org.apache.archiva.redback.rest.api.model.ErrorMessage; import org.apache.archiva.redback.rest.api.model.v2.Group; import org.apache.archiva.redback.rest.api.model.v2.GroupMapping; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; import org.apache.archiva.redback.rest.api.services.v2.GroupService; import org.slf4j.Logger; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultRoleService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultRoleService.java index d70f556..6109bfc 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultRoleService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultRoleService.java @@ -18,13 +18,14 @@ package org.apache.archiva.redback.rest.services.v2; * under the License. */ +import org.apache.archiva.components.rest.model.PagedResult; +import org.apache.archiva.components.rest.util.QueryHelper; +import org.apache.archiva.components.rest.util.RestUtil; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; import org.apache.archiva.redback.rest.api.MessageKeys; -import org.apache.archiva.redback.rest.api.Util; import org.apache.archiva.redback.rest.api.model.ErrorMessage; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.Role; import org.apache.archiva.redback.rest.api.model.v2.RoleInfo; import org.apache.archiva.redback.rest.api.model.v2.RoleTemplate; @@ -432,7 +433,7 @@ public class DefaultRoleService extends BaseRedbackService String searchTerm, Integer offset, Integer limit, List<String> orderBy, String order ) throws RedbackServiceException { boolean ascending = isAscending( order ); - boolean recursePresent = Util.isFlagSet( uriInfo, "recurse" ); + boolean recursePresent = RestUtil.isFlagSet( uriInfo, "recurse" ); boolean parentsOnly = "parentsOnly".equals( recurse ); try { @@ -454,7 +455,7 @@ public class DefaultRoleService extends BaseRedbackService public PagedResult<UserInfo> getUnassignedUsers( String roleId, String recurse, String searchTerm, Integer offset, Integer limit, List<String> orderBy, String order ) throws RedbackServiceException { boolean ascending = isAscending( order ); - boolean recursePresent = Util.isFlagSet( uriInfo, "recurse" ); + boolean recursePresent = RestUtil.isFlagSet( uriInfo, "recurse" ); boolean parentsOnly = "parentsOnly".equals( recurse ); try { diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultUserService.java index c15daad..30983bb 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultUserService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/v2/DefaultUserService.java @@ -21,6 +21,7 @@ package org.apache.archiva.redback.rest.services.v2; import net.sf.ehcache.CacheManager; import org.apache.archiva.components.cache.Cache; +import org.apache.archiva.components.rest.model.PagedResult; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.Token; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; @@ -50,7 +51,6 @@ import org.apache.archiva.redback.rest.api.model.v2.Application; import org.apache.archiva.redback.rest.api.model.v2.AvailabilityStatus; import org.apache.archiva.redback.rest.api.model.v2.BaseRoleInfo; import org.apache.archiva.redback.rest.api.model.v2.Operation; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.PasswordChange; import org.apache.archiva.redback.rest.api.model.v2.Permission; import org.apache.archiva.redback.rest.api.model.v2.PingResult; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/AuthenticationServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/AuthenticationServiceTest.java index 1e3d492..0baa3a3 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/AuthenticationServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/AuthenticationServiceTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.redback.rest.services.v2; */ import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; -import org.apache.archiva.redback.rest.api.model.GrantType; +import org.apache.archiva.redback.rest.api.model.v2.GrantType; import org.apache.archiva.redback.rest.api.model.v2.TokenRequest; import org.apache.archiva.redback.rest.api.model.v2.TokenResponse; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeRoleServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeRoleServiceTest.java index 0b6c33c..8cd8384 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeRoleServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeRoleServiceTest.java @@ -19,10 +19,8 @@ package org.apache.archiva.redback.rest.services.v2; */ import io.restassured.response.Response; -import io.restassured.response.ResponseBodyExtractionOptions; -import org.apache.archiva.redback.rest.api.model.User; +import org.apache.archiva.components.rest.model.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.BaseUserInfo; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.Permission; import org.apache.archiva.redback.rest.api.model.v2.RoleInfo; import org.apache.archiva.redback.rest.api.model.v2.RoleTemplate; @@ -44,7 +42,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static io.restassured.RestAssured.given; import static io.restassured.http.ContentType.JSON; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/UserServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/UserServiceTest.java index 0cc32b3..1f8f722 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/UserServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/UserServiceTest.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.rest.services.v2; * under the License. */ -import org.apache.archiva.redback.rest.api.model.GrantType; +import org.apache.archiva.components.rest.model.PagedResult; +import org.apache.archiva.redback.rest.api.model.v2.GrantType; import org.apache.archiva.redback.rest.api.model.v2.Operation; import org.apache.archiva.redback.rest.api.model.v2.SelfUserData; -import org.apache.archiva.redback.rest.api.model.v2.PagedResult; import org.apache.archiva.redback.rest.api.model.v2.Permission; import org.apache.archiva.redback.rest.api.model.v2.PingResult; import org.apache.archiva.redback.rest.api.model.v2.TokenRequest; @@ -124,7 +124,7 @@ public class UserServiceTest { String adminHeader = getAdminAuthzHeader( ); UserService userService = getUserService( adminHeader ); - PagedResult<org.apache.archiva.redback.rest.api.model.v2.UserInfo> users = userService.getUsers( "", 0, Integer.MAX_VALUE, Collections.emptyList(), "asc" ); + PagedResult<UserInfo> users = userService.getUsers( "", 0, Integer.MAX_VALUE, Collections.emptyList(), "asc" ); assertNotNull( users ); assertFalse( users.getData().isEmpty( ) ); }
