diff options
author | Nils Schwabe | 2014-08-28 15:16:01 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-08-28 15:16:01 +0200 |
commit | d9b0b68c0926e60fcdedf1047a76051676b37d65 (patch) | |
tree | 27214e5bf037ca5e21f4466af76b0fa73db3b46c /src/main/java/org/openslx/imagemaster/server | |
parent | Fix bug where the challengeResponse was to long (diff) | |
download | masterserver-d9b0b68c0926e60fcdedf1047a76051676b37d65.tar.gz masterserver-d9b0b68c0926e60fcdedf1047a76051676b37d65.tar.xz masterserver-d9b0b68c0926e60fcdedf1047a76051676b37d65.zip |
Make javadoc and some cosmetic changes
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/server/ApiServer.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java index 1428838..104d98d 100644 --- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java +++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java @@ -45,6 +45,7 @@ import org.openslx.imagemaster.thrift.iface.UserInfo; */ public class ApiServer { + /** * Request for authentication * @@ -83,32 +84,33 @@ public class ApiServer return new UserInfo( session.getUserId(), session.getFirstName(), session.getLastName(), session.getEMail() ); } - - public static UploadInfos submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) throws AuthorizationException, ImageDataException, UploadException + + public static UploadInfos submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) + throws AuthorizationException, ImageDataException, UploadException { // first check session of server if ( ServerSessionManager.getSession( serverSessionId ) == null ) { - throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessioId" ); - } + throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessioId" ); + } // then let the image processor decide what to do - return ImageProcessor.getUploadInfos(serverSessionId, imageDescription, crcSums); + return ImageProcessor.getUploadInfos( serverSessionId, imageDescription, crcSums ); } - + public static DownloadInfos getImage( String uuid, String serverSessionId, List<Integer> requestedBlocks ) throws AuthorizationException, ImageDataException { // first check session of server if ( ServerSessionManager.getSession( serverSessionId ) == null ) { - throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionId" ); - } - - if (!DbImage.exists( uuid )) { + throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessionId" ); + } + + if ( !DbImage.exists( uuid ) ) { throw new ImageDataException( ImageDataError.UNKNOWN_IMAGE, "UUID is not known by this server." ); } - + // then let the image processor decide what to do return ImageProcessor.getDownloadInfos( serverSessionId, uuid, requestedBlocks ); } - + /** * Start the server authentication of a uni/hs satellite server. * |