Fix some small things

1 files changed, 45 insertions, 41 deletions

diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index 5cb53d0..fa089d4 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -11,7 +11,7 @@ import org.openslx.imagemaster.thrift.iface.ImageData;
 public class DbImage
 {
 
-	public final String UUID;
+	public final String uuid;
 	public final int imageVersion;
 	public final String imageName;
 	public final String imagePath;
@@ -28,11 +28,10 @@ public class DbImage
 	public final String token;
 	public final List<Integer> missingBlocks;
 	public final String serverSessionId;
-	
 
-	public DbImage(String UUID)
+	public DbImage(String uuid)
 	{
-		this.UUID = UUID;
+		this.uuid = uuid;
 		this.imageVersion = 0;
 		this.imageName = null;
 		this.imagePath = null;
@@ -50,13 +49,13 @@ public class DbImage
 		this.missingBlocks = null;
 		this.serverSessionId = null;
 	}
-	
+
 	public DbImage(String UUID, int imageVersion, String imageName, String imagePath,
 			Timestamp imageCreateTime, Timestamp imageUpdateTime, String imageOwner, String contentOperatingSystem,
 			boolean isValid, boolean isDeleted, String shortDescription, String longDescription,
 			Timestamp timestamp, long fileSize, String token, String missingBlocksList, String serverSessionId)
 	{
-		this.UUID = UUID;
+		this.uuid = UUID;
 		this.imageVersion = imageVersion;
 		this.imageName = imageName;
 		this.imagePath = imagePath;
@@ -71,13 +70,13 @@ public class DbImage
 		this.timestamp = timestamp;
 		this.fileSize = fileSize;
 		this.token = token;
-		
+
 		String[] parts = missingBlocksList.split( ";" );
 		this.missingBlocks = new LinkedList<>();
-		for (int i = 0; i < parts.length - 1; i++) {		// do not copy the last empty string	(1;2;3;) -> "1","2","3",""
+		for ( int i = 0; i < parts.length - 1; i++ ) {		// do not copy the last empty string	(1;2;3;) -> "1","2","3",""
 			this.missingBlocks.add( Integer.valueOf( parts[i] ) );
 		}
-		
+
 		this.serverSessionId = serverSessionId;
 	}
 
@@ -94,6 +93,7 @@ public class DbImage
 
 	/**
 	 * Insert a new image into database
+	 * 
 	 * @param imageData The metadata of the image
 	 * @param ts The timestamp of inserting
 	 * @param token The token that is able to upload this image
@@ -101,20 +101,20 @@ public class DbImage
 	 * @param serverSessionId The server that is uploading this image
 	 * @return Affected rows
 	 */
-	public static int insert( ImageData imageData, long ts, String token, List<Integer> missingBlocks, String serverSessionId, String filepath)
+	public static int insert( ImageData imageData, long ts, String token, List<Integer> missingBlocks, String serverSessionId, String filepath )
 	{
 		Date createTime = new Date( imageData.imageCreateTime );
 		Date updateTime = new Date( imageData.imageUpdateTime );
 		Date timestamp = new Date( ts );
 		SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
-		
+
 		String missingBlocksList = "";
-		if (missingBlocks != null) {
-      	for (Integer block : missingBlocks) {
-      		missingBlocksList = missingBlocksList + String.valueOf( block ) + ";";
-      	}
+		if ( missingBlocks != null ) {
+			for ( Integer block : missingBlocks ) {
+				missingBlocksList = missingBlocksList + String.valueOf( block ) + ";";
+			}
 		}
-		
+
 		return MySQL
 				.update(
 						"INSERT INTO images (UUID, image_version, image_name, image_path, image_createTime, image_updateTime, image_owner, content_operatingSystem, status_isValid, status_isDeleted, image_shortDescription, image_longDescription, timestamp, fileSize, token, missingBlocks, serverSessionId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
@@ -123,53 +123,57 @@ public class DbImage
 						imageData.conentOperatingSystem, imageData.statusIsValid,
 						imageData.statusIsDeleted, imageData.imageShortDescription,
 						imageData.imageLongDescription, sdf.format( timestamp ), imageData.fileSize,
-						token, missingBlocksList, serverSessionId);
+						token, missingBlocksList, serverSessionId );
 	}
 
 	public String getUUID()
 	{
-		return this.UUID;
+		return this.uuid;
 	}
 
-	// TODO: updateLocation? Also make all these update/delete methods non-static,
-	// so you can call them on an instance you retreived earlier.
-	public static int update( String uuid, String location )
-	{
-		return MySQL.update( "UPDATE images SET images.image_path = ? WHERE images.UUID = ?", location, uuid );
-	}
-	
-	public static int updateMissingBlocks( String uuid, List<Integer> missingBlocks)
+	public int updateMissingBlocks( List<Integer> missingBlocks )
 	{
 		String missingBlocksList = "";
-		if (missingBlocks != null) {
-      	for (Integer block : missingBlocks) {
-      		missingBlocksList = missingBlocksList + String.valueOf( block ) + ";";
-      	}
+		if ( missingBlocks != null ) {
+			for ( Integer block : missingBlocks ) {
+				missingBlocksList = missingBlocksList + String.valueOf( block ) + ";";
+			}
 		}
 		return MySQL.update( "UPDATE images SET images.missingBlocks = ? WHERE images.UUID = ?", missingBlocksList, uuid );
 	}
 
-	public static int delete( String UUID )
+	public int delete()
 	{
-		return MySQL.update( "DELETE FROM images WHERE images.UUID=?", UUID );
+		return MySQL.update( "DELETE FROM images WHERE images.UUID=?", uuid );
 	}
-	
+
 	public static List<DbImage> getUploadingImages()
 	{
-		return MySQL.findAll( DbImage.class, "SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.fileSize, images.token, images.missingBlocks, images.serverSessionId FROM images WHERE missingBlocks != ?", "" );
+		return MySQL
+				.findAll(
+						DbImage.class,
+						"SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.fileSize, images.token, images.missingBlocks, images.serverSessionId FROM images WHERE missingBlocks != ?",
+						"" );
 	}
-	
-	public static DbImage getImageByUUID(String uuid) {
-		return MySQL.findUniqueOrNull( DbImage.class, "SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.fileSize, images.token, images.missingBlocks, images.serverSessionId FROM images WHERE uuid = ?", uuid );
+
+	public static DbImage getImageByUUID( String uuid )
+	{
+		return MySQL
+				.findUniqueOrNull(
+						DbImage.class,
+						"SELECT images.UUID, images.image_version, images.image_name, images.image_path, images.image_createTime, images.image_updateTime, images.image_owner, images.content_operatingSystem, images.status_isValid, images.status_isDeleted, images.image_shortDescription, images.image_longDescription, images.timestamp, images.fileSize, images.token, images.missingBlocks, images.serverSessionId FROM images WHERE uuid = ?",
+						uuid );
 	}
-	
+
 	/**
 	 * Creates an instance of the thrift ImageData class of this DbImage object.
+	 * 
 	 * @return The corresponding image data
 	 */
-	public ImageData getImageData() {
-		return new ImageData(this.UUID, this.imageVersion, this.imageName, this.imageCreateTime.getTime(),
+	public ImageData getImageData()
+	{
+		return new ImageData( this.uuid, this.imageVersion, this.imageName, this.imageCreateTime.getTime(),
 				this.imageUpdateTime.getTime(), this.imageOwner, this.contentOperatingSystem, this.isValid,
-				this.isDeleted, this.shortDescription, this.longDescription, this.fileSize);
+				this.isDeleted, this.shortDescription, this.longDescription, this.fileSize );
 	}
 }