diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java index fe878ce..3b9ffc1 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java @@ -3,8 +3,6 @@ package org.openslx.imagemaster.thrift.server; import java.nio.ByteBuffer; import java.util.List; -import org.apache.log4j.Logger; -import org.apache.thrift.TException; import org.openslx.imagemaster.server.ApiServer; import org.openslx.imagemaster.thrift.iface.AuthenticationException; import org.openslx.imagemaster.thrift.iface.AuthorizationException; @@ -14,7 +12,6 @@ import org.openslx.imagemaster.thrift.iface.ImageDataException; import org.openslx.imagemaster.thrift.iface.ImageServer; import org.openslx.imagemaster.thrift.iface.InvalidTokenException; import org.openslx.imagemaster.thrift.iface.OrganizationData; -import org.openslx.imagemaster.thrift.iface.ServerAuthenticationException; import org.openslx.imagemaster.thrift.iface.ServerSessionData; import org.openslx.imagemaster.thrift.iface.SessionData; import org.openslx.imagemaster.thrift.iface.UploadData; @@ -25,9 +22,8 @@ public class ImageServerHandler implements ImageServer.Iface { @Override - public boolean ping() throws TException + public boolean ping() { - // Return false if service unavailable but running return true; } @@ -47,53 +43,58 @@ public class ImageServerHandler implements ImageServer.Iface @Override public ByteBuffer startServerAuthentication( String organization ) - throws ServerAuthenticationException + throws AuthenticationException { return ApiServer.startServerAuthentication( organization ); } @Override public ServerSessionData serverAuthenticate( String organization, - ByteBuffer challengeResponse ) throws AuthenticationException, - TException + ByteBuffer challengeResponse ) throws AuthenticationException { return ApiServer.serverAuthenticate( organization, challengeResponse ); } @Override public UploadData submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) - throws AuthorizationException, ImageDataException, UploadException, TException + throws AuthorizationException, ImageDataException, UploadException { return ApiServer.submitImage( serverSessionId, imageDescription, crcSums ); } @Override - public DownloadData getImage( String serverSessionId, String uuid ) throws AuthorizationException, ImageDataException, TException + public DownloadData getImage( String serverSessionId, String uuid ) throws AuthorizationException, ImageDataException { return ApiServer.getImage( uuid, serverSessionId ); } @Override - public boolean isServerAuthenticated( String serverSessionId ) throws TException + public boolean isServerAuthenticated( String serverSessionId ) { return ApiServer.isServerAuthenticated( serverSessionId ); } @Override - public List<OrganizationData> getOrganizations() throws TException + public List<OrganizationData> getOrganizations() { return ApiServer.getOrganizations(); } @Override - public List<UserInfo> findUser( String sessionId, String organizationId, String searchTerm ) throws TException + public List<UserInfo> findUser( String sessionId, String organizationId, String searchTerm ) { return ApiServer.findUser( sessionId, organizationId, searchTerm ); } @Override - public boolean publishUser( String serverSessionId, UserInfo user ) throws TException + public boolean publishUser( String serverSessionId, UserInfo user ) { return ApiServer.publishUser( serverSessionId, user ); } + + @Override + public List<ImageData> getPublicImages( String sessionId, int page ) + { + return ApiServer.getPublicImages( sessionId, page ); + } } |