From 232979ea053c3cba3fb295b4b464af15ccab5c63 Mon Sep 17 00:00:00 2001
From: Sweidan Omar <TFS\sweidan.omar>
Date: Fri, 10 Dec 2021 16:07:14 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32569

---
 .../LOCAL/jobs/steps/CalculateMD5Step.java    | 46 ++++---------------
 .../server/steps/CalculateMD5Step.java        | 42 ++++-------------
 2 files changed, 16 insertions(+), 72 deletions(-)

diff --git a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
index cd4cf510..94543db9 100644
--- a/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
+++ b/server/-product/production/LOCAL/jobs/steps/CalculateMD5Step.java
@@ -1,19 +1,13 @@
 package user.jobengine.server.steps;
 
-import java.io.InputStream;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.DigestInputStream;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+
+import javax.xml.bind.DatatypeConverter;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.ParameterizedMessage;
-
-import user.commons.MediaCubeMarker;
 
 public class CalculateMD5Step extends JobStep {
 	private static final Logger logger = LogManager.getLogger(CalculateMD5Step.class);
@@ -24,35 +18,11 @@ public class CalculateMD5Step extends JobStep {
 //		Message msg = new ParameterizedMessage("");
 //		logger.info(new MediaCubeMarker("vasary@elgekko.net,vasary@gmail.com", "MediaCube rendszerüzenet"), msg);
 
-		// getting file size
-		Path fileToDigest = Paths.get(fileName);
-		long fileSize = Files.size(fileToDigest);
-
-		MessageDigest messageDigest = null;
-		InputStream is = null;
-		DigestInputStream dis = null;
-		byte[] byteArray = new byte[1024]; // TODO buffersize mereture atirni
-		byte[] digest = null;
-		String md5String = null;
-		int byteCount = 0;
-
-		try {
-			messageDigest = MessageDigest.getInstance("MD5");
-			is = Files.newInputStream(Paths.get(fileName));
-			dis = new DigestInputStream(is, messageDigest);
-			while ((byteCount = dis.read(byteArray)) != -1) {
-				messageDigest.update(byteArray, 0, byteCount);
-				digest = messageDigest.digest();
-				setProgress(1);
-			}
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		} finally {
-			dis.close();
-		}
-
-		logger.info("digest= {}", digest.toString());
-		logger.info("fileSize= {} bytes", fileSize);
-		return new Object[] { digest.toString() };
+		MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+		messageDigest.update(Files.readAllBytes(Paths.get(fileName)));
+		byte[] digest = messageDigest.digest();
+		String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();
+		logger.info("calculated MD5 hash= {}", md5String);
+		return new Object[] { md5String };
 	}
 }
\ No newline at end of file
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
index e6e7d9c1..94543db9 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CalculateMD5Step.java
@@ -1,12 +1,10 @@
 package user.jobengine.server.steps;
 
-import java.io.InputStream;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.DigestInputStream;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+
+import javax.xml.bind.DatatypeConverter;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -20,35 +18,11 @@ public class CalculateMD5Step extends JobStep {
 //		Message msg = new ParameterizedMessage("");
 //		logger.info(new MediaCubeMarker("vasary@elgekko.net,vasary@gmail.com", "MediaCube rendszerüzenet"), msg);
 
-		// getting file size
-		Path fileToDigest = Paths.get(fileName);
-		long fileSize = Files.size(fileToDigest);
-
-		MessageDigest messageDigest = null;
-		InputStream is = null;
-		DigestInputStream dis = null;
-		byte[] byteArray = new byte[1024]; // TODO buffersize mereture atirni
-		byte[] digest = null;
-		String md5String = null;
-		int byteCount = 0;
-
-		try {
-			messageDigest = MessageDigest.getInstance("MD5");
-			is = Files.newInputStream(Paths.get(fileName));
-			dis = new DigestInputStream(is, messageDigest);
-			while ((byteCount = dis.read(byteArray)) != -1) {
-				messageDigest.update(byteArray, 0, byteCount);
-				digest = messageDigest.digest();
-				setProgress(1);
-			}
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		} finally {
-			dis.close();
-		}
-
-		logger.info("digest= {}", digest.toString());
-		logger.info("fileSize= {} bytes", fileSize);
-		return new Object[] { digest.toString() };
+		MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+		messageDigest.update(Files.readAllBytes(Paths.get(fileName)));
+		byte[] digest = messageDigest.digest();
+		String md5String = DatatypeConverter.printHexBinary(digest).toUpperCase();
+		logger.info("calculated MD5 hash= {}", md5String);
+		return new Object[] { md5String };
 	}
 }
\ No newline at end of file
-- 
2.54.0