From cfa03468e10e28867904a58f86222862859e165c Mon Sep 17 00:00:00 2001 From: Björn Hagemeister Date: Tue, 7 Oct 2014 16:39:06 +0200 Subject: Adapted FielUploadWorker and ThriftConnection for using publishUser(..). But publishUser ist not implemented yet. Plus added class DbUser for reading from user database. --- .../openslx/satellitedaemon/filetransfer/FileUploadWorker.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java') diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java index 8ace390..6947b5a 100644 --- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java @@ -2,15 +2,16 @@ package org.openslx.satellitedaemon.filetransfer; import java.io.IOException; import java.util.List; -import java.util.UUID; import org.apache.log4j.Logger; import org.openslx.filetransfer.Uploader; import org.openslx.imagemaster.thrift.iface.ImageData; import org.openslx.imagemaster.thrift.iface.UploadData; +import org.openslx.imagemaster.thrift.iface.UserInfo; import org.openslx.satellitedaemon.Globals; import org.openslx.satellitedaemon.db.DbImage; import org.openslx.satellitedaemon.db.DbImage.Status; +import org.openslx.satellitedaemon.db.DbUser; public class FileUploadWorker implements Runnable { @@ -35,7 +36,10 @@ public class FileUploadWorker implements Runnable String path = Globals.getImageFolder() + "/" + image.path; // ThriftConnection.getUploadInfos returns uploadInfo and handles ThriftAuthentication - UploadData upInfos = ThriftConnection.getUploadInfos( imDat, path ); + DbUser dbUser = DbUser.getUserById(imDat.ownerLogin); + UserInfo userInfo = new UserInfo(dbUser.userId, dbUser.firstName, dbUser.lastName, dbUser.email, null); + ThriftConnection.publishUser(userInfo); + UploadData upInfos = ThriftConnection.getUploadInfos( imDat, path); if ( upInfos == null ) { log.error( "The UploadInfos returned by ThriftConnection Class are null" ); continue; -- cgit v1.2.3-55-g7522