LMS-1593 add user ID to DataSetInformation as registrator

SVN: 17914

datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java

@@ -432,6 +432,7 @@ public abstract class DataSetRegistrationAlgorithm
     private NewExternalData createExternalData()
     {
         final NewExternalData data = new NewExternalData();
+        data.setUserId(dataSetInformation.getUploadingUserIdOrNull());
         data.setUserEMail(dataSetInformation.tryGetUploadingUserEmail());
         data.setExtractableData(dataSetInformation.getExtractableData());
         data.setLocatorType(getTypeExtractor().getLocatorType(incomingDataSetFile));

datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java

@@ -607,11 +607,7 @@ class PutDataSetExecutor implements IDataSetHandlerRpc
 
             final SessionContextDTO session =
                     service.getOpenBisService().tryGetSession(sessionToken);
-            dataSetInfo.setUploadingUserEmail(session.getUserEmail());
-
-            // TODO 2010-06-10, CR, LMS-1564: When registering, set the registrator to the session
-            // owner; only an admin on
-            // the space or an ETL server can override.
+            dataSetInfo.setUploadingUserId(session.getUserName());
             return dataSetInfo;
         }
     }

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java

@@ -88,6 +88,8 @@ public class DataSetInformation implements Serializable
      * Email of uploading user.
      */
     private String uploadingUserEmailOrNull;
+    
+    private String uploadingUserIdOrNull;
 
     /** This constructor is for serialization. */
     public DataSetInformation()
@@ -104,6 +106,16 @@ public class DataSetInformation implements Serializable
         this.uploadingUserEmailOrNull = uploadingUserEmail;
     }
 
+    public void setUploadingUserId(String uploadingUserIdOrNull)
+    {
+        this.uploadingUserIdOrNull = uploadingUserIdOrNull;
+    }
+
+    public String getUploadingUserIdOrNull()
+    {
+        return uploadingUserIdOrNull;
+    }
+
     public final BooleanOrUnknown getIsCompleteFlag()
     {
         return isCompleteFlag;