From 8e6023173db17c3971443ea2af6cc2a6dbee41ca Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 26 Jul 2020 18:29:07 +0200
Subject: [PATCH] Adding global id to REST model

---
 .../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 d7f77fe5..4a3367db 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()
     {