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 14ebb1e898616390818376674979f879b1f696a2 Author: Martin Stockhammer <[email protected]> AuthorDate: Sat Nov 7 21:29:34 2020 +0100 Removing system id from user json --- .../archiva/redback/rest/api/model/v2/User.java | 13 ------------- .../rest/services/v2/NativeUserServiceTest.java | 19 ++++++++----------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/User.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/User.java index a2537aa..67dc792 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/User.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/v2/User.java @@ -38,8 +38,6 @@ public class User private static final long serialVersionUID = 7457798933140993643L; - private String id; - private String userId; private String fullName; @@ -123,7 +121,6 @@ public class User this.setPasswordChangeRequired( user.isPasswordChangeRequired() ); this.setPermanent( user.isPermanent() ); this.setUserManagerId( user.getUserManagerId() ); - this.setId( user.getId() ); if (user.getAccountCreationDate()==null) { setTimestampAccountCreationByInstant( Instant.EPOCH ); @@ -335,16 +332,6 @@ public class User this.validationToken = validationToken; } - public String getId( ) - { - return id; - } - - public void setId( String id ) - { - this.id = id; - } - @Override public String toString() { diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeUserServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeUserServiceTest.java index 1251176..3f9e93c 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeUserServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/v2/NativeUserServiceTest.java @@ -23,6 +23,7 @@ import org.apache.archiva.redback.rest.api.model.v2.Operation; import org.apache.archiva.redback.rest.api.model.v2.Permission; import org.apache.archiva.redback.rest.api.model.v2.RegistrationKey; import org.apache.archiva.redback.rest.api.model.v2.User; +import org.apache.archiva.redback.rest.api.model.v2.UserInfo; import org.apache.archiva.redback.rest.api.model.v2.VerificationStatus; import org.apache.archiva.redback.rest.services.mock.EmailMessage; import org.junit.jupiter.api.AfterAll; @@ -83,7 +84,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).get( ).then( ).statusCode( 200 ).extract( ).response( ); assertNotNull( response ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); assertEquals( 2, userData.size( ) ); assertEquals( Integer.valueOf( 0 ), response.body( ).jsonPath( ).get( "pagination.offset" ) ); @@ -130,11 +131,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).get( ).then( ).statusCode( 200 ).extract( ).response( ); assertNotNull( response ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); - for ( User user : userData ) - { - System.out.println( "User " + user.getUserId( ) ); - } + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); assertEquals( "admin", userData.get( 0 ).getUserId( ) ); assertEquals( userNum + 2, userData.size( ) ); @@ -152,7 +149,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices params.put( "offset", Integer.toString( 1 ) ); Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).params( params ).get( ).then( ).statusCode( 200 ).extract( ).response( ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); assertEquals( "aragorn000", userData.get( 0 ).getUserId( ) ); assertEquals( "aragorn009", userData.get( 9 ).getUserId( ) ); @@ -171,7 +168,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices params.put( "orderBy", "email" ); Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).params( params ).get( ).then( ).statusCode( 200 ).extract( ).response( ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); // admin user has [email protected] as email so is after aragorn assertEquals( "[email protected]", userData.get( 0 ).getEmail() ); @@ -192,7 +189,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices params.put( "orderBy", "fullName" ); Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).params( params ).get( ).then( ).statusCode( 200 ).extract( ).response( ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); // admin user has [email protected] as email so is after aragorn assertEquals( "Aragorn King of Gondor 010", userData.get( 0 ).getFullName() ); @@ -213,7 +210,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices params.put( "order", "desc" ); Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).params( params ).get( ).then( ).statusCode( 200 ).extract( ).response( ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); assertEquals( "guest", userData.get( 0 ).getUserId( ) ); assertEquals( "aragorn016", userData.get( 9 ).getUserId( ) ); @@ -231,7 +228,7 @@ public class NativeUserServiceTest extends AbstractNativeRestServices params.put( "q", "015" ); Response response = given( ).spec( getRequestSpec( token ) ).contentType( JSON ) .when( ).params( params ).get( ).then( ).statusCode( 200 ).extract( ).response( ); - List<User> userData = response.body( ).jsonPath( ).getList( "data", User.class ); + List<UserInfo> userData = response.body( ).jsonPath( ).getList( "data", UserInfo.class ); assertNotNull( userData ); assertEquals( "aragorn010", userData.get( 0 ).getUserId( ) ); assertEquals( "[email protected]", userData.get( 0 ).getEmail( ) );
