sumHash() renamed to sum()

Author: bosik

portable/comp-transfer/src/main/java/org/bosik/merklesync/HashUtils.java

@@ -135,6 +135,10 @@ public static String byteToStr(byte[] bytes)
 		return new String(chars);
 	}
 
+	// --------------------------------------------------------------------------------------
+	// ARITHMETIC
+	// --------------------------------------------------------------------------------------
+
 	/**
 	 * null + a = a<br/>
 	 * null + null = null
@@ -143,7 +147,7 @@ public static String byteToStr(byte[] bytes)
 	 * @param b
 	 * @return
 	 */
-	public static String sumHash(String a, String b)
+	public static String sum(String a, String b)
 	{
 		if (a != null && a.length() != DataSource.HASH_SIZE)
 		{
@@ -187,12 +191,16 @@ public static String calculateHash(Collection<String> collection)
 
 		for (String hash : collection)
 		{
-			result = sumHash(result, hash);
+			result = sum(result, hash);
 		}
 
 		return result;
 	}
 
+	// --------------------------------------------------------------------------------------
+	// MERKLE TREE OPERATIONS
+	// --------------------------------------------------------------------------------------
+
 	public static SortedMap<String, String> buildParentHashes(SortedMap<String, String> map, int prefixSize)
 	{
 		SortedMap<String, String> result = new TreeMap<>();

portable/comp-transfer/src/test/java/org/bosik/merklesync/TestHashUtils.java

@@ -130,7 +130,7 @@ public void test_strToByteToStr()
 	public void test_performance_byteToStr()
 	{
 		final List<byte[]> bytes = new ArrayList<>();
-		for (int i = 0; i < 1000000; i++)
+		for (int i = 0; i < 1_000_000; i++)
 		{
 			bytes.add(HashUtils.strToByte(HashUtils.generateGuid()));
 		}
@@ -163,16 +163,16 @@ public void test_performance_toInt()
 	}
 
 	@Test
-	public void test_sumHash()
+	public void test_sumStrings()
 	{
 		assertEquals("00000000000000000000000000000000",
-				HashUtils.sumHash("00000000000000000000000000000000", "00000000000000000000000000000000"));
+				HashUtils.sum("00000000000000000000000000000000", "00000000000000000000000000000000"));
 		assertEquals("22222222222222222222222222222222",
-				HashUtils.sumHash("11111111111111111111111111111111", "11111111111111111111111111111111"));
+				HashUtils.sum("11111111111111111111111111111111", "11111111111111111111111111111111"));
 		assertEquals("ffffffffffffffffffffffffffffffff",
-				HashUtils.sumHash("88888888888888888888888888888888", "77777777777777777777777777777777"));
+				HashUtils.sum("88888888888888888888888888888888", "77777777777777777777777777777777"));
 		assertEquals("00000000000000000000000000000000",
-				HashUtils.sumHash("88888888888888888888888888888888", "88888888888888888888888888888888"));
+				HashUtils.sum("88888888888888888888888888888888", "88888888888888888888888888888888"));
 	}
 
 	@Test
@@ -181,7 +181,7 @@ public void test_performance_buildHashTree()
 	{
 		long time = System.currentTimeMillis();
 		SortedMap<String, String> data = new TreeMap<>();
-		for (int i = 0; i < 500000; i++)
+		for (int i = 0; i < 500_000; i++)
 		{
 			String id = HashUtils.generateGuid();
 			String hash = HashUtils.generateGuid();