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 8e6023173db17c3971443ea2af6cc2a6dbee41ca
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Jul 26 18:29:07 2020 +0200

    Adding global id to REST model
---
 .../org/apache/archiva/redback/rest/api/model/v2/User.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 d7f77fe..4a3367d 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
@@ -34,6 +34,9 @@ public class User
 
 
     private static final long serialVersionUID = 7457798933140993643L;
+
+    private String id;
+
     private String userId;
 
     private String fullName;
@@ -118,6 +121,7 @@ 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 );
@@ -323,6 +327,16 @@ public class User
         this.validationToken = validationToken;
     }
 
+    public String getId( )
+    {
+        return id;
+    }
+
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+
     @Override
     public String toString()
     {

Reply via email to