From cd07d725aa694f77cd67ba56298735a2777ed227 Mon Sep 17 00:00:00 2001 From: Nils Schwabe Date: Mon, 21 Jul 2014 13:58:47 +0200 Subject: [thrift] Add new error code for invalid blocks --- .../java/org/openslx/imagemaster/crcchecker/CRCFile.java | 16 +++++----------- .../thrift/iface/AuthenticationException.java | 2 +- .../imagemaster/thrift/iface/AuthorizationException.java | 2 +- .../openslx/imagemaster/thrift/iface/DownloadInfos.java | 2 +- .../openslx/imagemaster/thrift/iface/FtpCredentials.java | 2 +- .../org/openslx/imagemaster/thrift/iface/ImageData.java | 2 +- .../imagemaster/thrift/iface/ImageDataException.java | 2 +- .../openslx/imagemaster/thrift/iface/ImageServer.java | 2 +- .../imagemaster/thrift/iface/InvalidTokenException.java | 2 +- .../thrift/iface/ServerAuthenticationException.java | 2 +- .../imagemaster/thrift/iface/ServerSessionData.java | 2 +- .../openslx/imagemaster/thrift/iface/SessionData.java | 2 +- .../openslx/imagemaster/thrift/iface/UploadError.java | 5 ++++- .../imagemaster/thrift/iface/UploadException.java | 2 +- .../openslx/imagemaster/thrift/iface/UploadInfos.java | 2 +- .../org/openslx/imagemaster/thrift/iface/UserInfo.java | 2 +- 16 files changed, 23 insertions(+), 26 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java b/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java index be061ce..a096bf6 100644 --- a/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java +++ b/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java @@ -11,14 +11,11 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.CRC32; -import org.apache.log4j.Logger; - /** * Represents a crc file */ public class CRCFile { - private static Logger log = Logger.getLogger( CRCFile.class ); private File file = null; private List crcSums = null; @@ -57,7 +54,7 @@ public class CRCFile DataOutputStream dos = new DataOutputStream( fos ); for ( Integer sum : listOfCrcSums ) { - dos.writeInt( sum.intValue() ); // save byte-reversed integers to match right order in crc file TODO: is that right? + dos.writeInt( sum.intValue() ); } dos.close(); @@ -74,13 +71,12 @@ public class CRCFile { if ( listOfCrcSums == null || listOfCrcSums.isEmpty() ) return false; - - byte[] bytes = new byte[ ( listOfCrcSums.size() - 2 ) * Integer.SIZE / 8 ]; - log.debug( listOfCrcSums.size() + ", " + bytes.length ); int masterSum = listOfCrcSums.remove( 0 ); byte[] bytesOfInt; - for ( int i = 0; i < ( listOfCrcSums.size() - 1 ); i++ ) { - bytesOfInt = ByteBuffer.allocate( 4 ).putInt( listOfCrcSums.get( 0 ) ).array(); // get the bytes of this integer + int size = listOfCrcSums.size(); + byte[] bytes = new byte[ size * Integer.SIZE / 8 ]; + for ( int i = 0; i < size; i++ ) { + bytesOfInt = ByteBuffer.allocate( 4 ).putInt( listOfCrcSums.remove( 0 ) ).array(); // get the bytes of this integer bytes[4 * i] = bytesOfInt[0]; bytes[4 * i + 1] = bytesOfInt[1]; bytes[4 * i + 2] = bytesOfInt[2]; @@ -88,8 +84,6 @@ public class CRCFile } CRC32 crcCalc = new CRC32(); crcCalc.update( bytes ); - log.debug( masterSum ); - log.debug( Integer.reverseBytes( (int)crcCalc.getValue() ) ); return ( masterSum == Integer.reverseBytes( (int)crcCalc.getValue() ) ); } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java index 6593e43..b700583 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class AuthenticationException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java index fb15f82..4236b80 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class AuthorizationException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java index c05abcc..644af99 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class DownloadInfos implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadInfos"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java b/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java index 2107c3d..c16b46d 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class FtpCredentials implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FtpCredentials"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java index 63e1f29..bba4219 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class ImageData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageData"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java index 4d24021..82a7f2d 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class ImageDataException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDataException"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java index b44bfc3..7369921 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class ImageServer { public interface Iface { diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java index 1397eab..e9bd2bc 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class InvalidTokenException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java index 76b8bb1..d540470 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class ServerAuthenticationException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerAuthenticationException"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java index c856232..b980b32 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class ServerSessionData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerSessionData"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java index d59121a..df21051 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class SessionData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SessionData"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java index cd87904..1c45965 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java @@ -12,7 +12,8 @@ import java.util.HashMap; import org.apache.thrift.TEnum; public enum UploadError implements org.apache.thrift.TEnum { - INVALID_CRC(0); + INVALID_CRC(0), + BROKEN_BLOCK(1); private final int value; @@ -35,6 +36,8 @@ public enum UploadError implements org.apache.thrift.TEnum { switch (value) { case 0: return INVALID_CRC; + case 1: + return BROKEN_BLOCK; default: return null; } diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java index af55da3..48abaec 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class UploadException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadException"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java index d5cfb18..423001f 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class UploadInfos implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadInfos"); diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java index d87c050..f16dd57 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java +++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-14") +@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21") public class UserInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserInfo"); -- cgit v1.2.3-55-g7522