Refactor code

Author: mozq

src/main/java/com/dencode/logic/dencoder/DencodeUtils.java

@@ -74,7 +74,7 @@ protected static <T, U, R> List<R> dencodeEach(List<T> vals, List<U> vals2, BiFu
 	}
 
 	protected static <T> String dencodeLines(List<T> vals, Function<T, String> func) {
-		return dencodeLines(vals, null, (val1, val2) -> func.apply(val1));
+		return dencodeLines(vals, null, (val1, _) -> func.apply(val1));
 	}
 
 	protected static <T, U> String dencodeLines(List<T> vals, List<U> vals2, BiFunction<T, U, String> func) {

src/main/java/com/dencode/logic/dencoder/StringBase32Dencoder.java

@@ -16,7 +16,7 @@
  */
 package com.dencode.logic.dencoder;
 
-import java.io.ByteArrayOutputStream;
+
 import java.nio.charset.Charset;
 
 import com.dencode.logic.dencoder.annotation.Dencoder;
@@ -118,7 +118,8 @@ private static String decStrBase32(String val, Charset charset) {
 			}
 		}
 
-		ByteArrayOutputStream binBuf = new ByteArrayOutputStream(len);
+		byte[] binBuf = new byte[len * 5 / 8]; // Max decoded size
+		int binBufIdx = 0;
 		int bitsBuf = 0;
 		int bitCount = 0;
 		for (int i = 0; i < len; i++) {
@@ -140,11 +141,11 @@ private static String decStrBase32(String val, Charset charset) {
 
 			if (8 <= bitCount) {
 				byte b = (byte)((bitsBuf >>> (bitCount - 8)) & 0b11111111);
-				binBuf.write(b);
+				binBuf[binBufIdx++] = b;
 				bitCount -= 8;
 			}
 		}
 
-		return binBuf.toString(charset);
+		return new String(binBuf, 0, binBufIdx, charset);
 	}
 }

src/main/java/com/dencode/logic/dencoder/StringBase64Dencoder.java

@@ -16,7 +16,7 @@
  */
 package com.dencode.logic.dencoder;
 
-import java.io.ByteArrayOutputStream;
+
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
@@ -134,7 +134,8 @@ private static String decode(String val, Charset charset) {
 			}
 		}
 
-		ByteArrayOutputStream binBuf = new ByteArrayOutputStream(len);
+		byte[] binBuf = new byte[len * 3 / 4]; // Max decoded size
+		int binBufIdx = 0;
 		int bitsBuf = 0;
 		int bitCount = 0;
 		for (int i = 0; i < len; i++) {
@@ -156,11 +157,11 @@ private static String decode(String val, Charset charset) {
 
 			if (8 <= bitCount) {
 				byte b = (byte)((bitsBuf >>> (bitCount - 8)) & 0b11111111);
-				binBuf.write(b);
+				binBuf[binBufIdx++] = b;
 				bitCount -= 8;
 			}
 		}
 
-		return binBuf.toString(charset);
+		return new String(binBuf, 0, binBufIdx, charset);
 	}
 }

src/main/java/com/dencode/logic/dencoder/StringHTMLEscapeDencoder.java

@@ -18,7 +18,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.dencode.logic.dencoder.annotation.Dencoder;
@@ -43,7 +42,7 @@ private static class Chars {
 		public char char2() { return this.char2; }
 		public Chars set(char char1) { return set(char1, '\0'); }
 		public Chars set(char char1, char char2) { this.char1 =char1; this.char2 =char2; this.hash = -1; return this; }
-		@Override public int hashCode() { if (this.hash == -1) { this.hash = Objects.hash(char1, char2); } return this.hash; }
+		@Override public int hashCode() { if (this.hash == -1) { this.hash = (char1 << 16) ^ char2; } return this.hash; }
 		@Override public boolean equals(Object obj) { return (char1 == ((Chars)obj).char1) && (char2 == ((Chars)obj).char2); }
 	}
 
@@ -2304,7 +2303,7 @@ public static void main(String[] args) throws Exception {
 
 	private static final Map<Chars, String> CHARS_NAME_MAP = NAME_CHARS_MAP.entrySet().stream()
 			.filter((entry) -> entry.getKey().charAt(entry.getKey().length() - 1) == ';')
-			.collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey, (first, second) -> first));
+			.collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey, (first, _) -> first));
 
 
 	private StringHTMLEscapeDencoder() {

src/main/java/com/dencode/logic/dencoder/StringQuotedPrintableDencoder.java

@@ -16,7 +16,7 @@
  */
 package com.dencode.logic.dencoder;
 
-import java.io.ByteArrayOutputStream;
+
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
@@ -169,7 +169,8 @@ private static String decode(String val, Charset charset) {
 		}
 
 		int len = val.length();
-		ByteArrayOutputStream binBuf = new ByteArrayOutputStream(len);
+		byte[] binBuf = new byte[len];
+		int binBufIdx = 0;
 
 		for (int i = 0; i < len; i++) {
 			char ch = val.charAt(i);
@@ -204,16 +205,16 @@ private static String decode(String val, Charset charset) {
 
 						int high = DencodeUtils.hexDigitToNum(ch1);
 						int low = DencodeUtils.hexDigitToNum(ch2);
-						binBuf.write((byte)((high << 4) | low));
+						binBuf[binBufIdx++] = (byte)((high << 4) | low);
 					} catch (IndexOutOfBoundsException | IllegalArgumentException e) {
 						return null;
 					}
 				}
 			} else {
-				binBuf.write((byte)ch);
+				binBuf[binBufIdx++] = (byte)ch;
 			}
 		}
 
-		return binBuf.toString(charset);
+		return new String(binBuf, 0, binBufIdx, charset);
 	}
 }