From b3ca4754ea0a6d9f5ff816d0fea91f6b091efbac Mon Sep 17 00:00:00 2001
From: Mattrixwv <m_ellison@ymail.com>
Date: Sat, 29 Apr 2023 11:38:32 -0400
Subject: [PATCH] Sonarqube fixes

---
 .../cipherstream/polysubstitution/Columnar.java      |  2 +-
 .../cipherstream/polysubstitution/Hill.java          |  5 +++--
 .../cipherstream/polysubstitution/TestHill.java      | 12 +++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Columnar.java b/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Columnar.java
index 1fe8e19..9b3dbc0 100644
--- a/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Columnar.java
+++ b/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Columnar.java
@@ -272,7 +272,7 @@ public class Columnar{
 
 		//Save and return the output
 		outputString = output.toString();
-		logger.debug("Output string '{}'", output.toString());
+		logger.debug("Output string '{}'", outputString);
 	}
 	protected void createOutputStringFromRows(){
 		logger.debug("Creating output string for decoding");
diff --git a/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Hill.java b/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Hill.java
index 988c0d9..a21f8f2 100644
--- a/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Hill.java
+++ b/src/main/java/com/mattrixwv/cipherstream/polysubstitution/Hill.java
@@ -193,8 +193,9 @@ public class Hill{
 			}
 		}
 
-		logger.debug("Polished string '{}'", outputBuilder.toString());
-		return outputBuilder.toString();
+		String cleanString = outputBuilder.toString();
+		logger.debug("Polished string '{}'", cleanString);
+		return cleanString;
 	}
 	protected ArrayList<ModMatrix> getInputVectors(){
 		logger.debug("Generating input vectors");
diff --git a/src/test/java/com/mattrixwv/cipherstream/polysubstitution/TestHill.java b/src/test/java/com/mattrixwv/cipherstream/polysubstitution/TestHill.java
index f7334ed..c56e03d 100644
--- a/src/test/java/com/mattrixwv/cipherstream/polysubstitution/TestHill.java
+++ b/src/test/java/com/mattrixwv/cipherstream/polysubstitution/TestHill.java
@@ -157,8 +157,10 @@ public class TestHill{
 
 	@Test
 	public void testSetKey_invalidMod(){
+		ModMatrix matrix = new ModMatrix(keyArray, 30);
+
 		assertThrows(InvalidKeyException.class, () -> {
-			cipher.setKey(new ModMatrix(keyArray, 30));
+			cipher.setKey(matrix);
 		});
 
 		assertEquals(new ModMatrix(26), cipher.key);
@@ -171,8 +173,10 @@ public class TestHill{
 
 	@Test
 	public void testSetKey_NotSquare(){
+		ModMatrix matrix = new ModMatrix(new int[][]{{10, 11}}, 26);
+
 		assertThrows(InvalidKeyException.class, () -> {
-			cipher.setKey(new ModMatrix(new int[][]{{10, 11}}, 26));
+			cipher.setKey(matrix);
 		});
 
 		assertEquals(new ModMatrix(26), cipher.key);
@@ -185,8 +189,10 @@ public class TestHill{
 
 	@Test
 	public void testSetKey_notInvertable(){
+		ModMatrix matrix = new ModMatrix(new int[][]{{10, 11}, {12, 13}}, 26);
+
 		assertThrows(InvalidKeyException.class, () -> {
-			cipher.setKey(new ModMatrix(new int[][]{{10, 11}, {12, 13}}, 26));
+			cipher.setKey(matrix);
 		});
 
 		assertEquals(new ModMatrix(26), cipher.key);