From e9c8397b863c490edbebf65547acd18cd4ce2388 Mon Sep 17 00:00:00 2001
From: Mattrixwv <m_ellison@ymail.com>
Date: Mon, 4 Jul 2022 01:19:59 -0400
Subject: [PATCH] Fixed more sonarqube findings

---
 .../cipherstream/monosubstitution/Porta.java  | 55 +++++--------------
 .../polysubstitution/PolybiusSquare.java      |  2 +-
 2 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/mattrixwv/cipherstream/monosubstitution/Porta.java b/src/main/java/com/mattrixwv/cipherstream/monosubstitution/Porta.java
index af5b36a..5823c85 100644
--- a/src/main/java/com/mattrixwv/cipherstream/monosubstitution/Porta.java
+++ b/src/main/java/com/mattrixwv/cipherstream/monosubstitution/Porta.java
@@ -81,47 +81,20 @@ public class Porta{
 		char replacer;
 
 		switch(keyLetter){
-			case 'A':
-			case 'B':
-				replacer = tableau[0].charAt(tableauColumn); break;
-			case 'C':
-			case 'D':
-				replacer = tableau[1].charAt(tableauColumn); break;
-			case 'E':
-			case 'F':
-				replacer = tableau[2].charAt(tableauColumn); break;
-			case 'G':
-			case 'H':
-				replacer = tableau[3].charAt(tableauColumn); break;
-			case 'I':
-			case 'J':
-				replacer = tableau[4].charAt(tableauColumn); break;
-			case 'K':
-			case 'L':
-				replacer = tableau[5].charAt(tableauColumn); break;
-			case 'M':
-			case 'N':
-				replacer = tableau[6].charAt(tableauColumn); break;
-			case 'O':
-			case 'P':
-				replacer = tableau[7].charAt(tableauColumn); break;
-			case 'Q':
-			case 'R':
-				replacer = tableau[8].charAt(tableauColumn); break;
-			case 'S':
-			case 'T':
-				replacer = tableau[9].charAt(tableauColumn); break;
-			case 'U':
-			case 'V':
-				replacer = tableau[10].charAt(tableauColumn); break;
-			case 'W':
-			case 'X':
-				replacer = tableau[11].charAt(tableauColumn); break;
-			case 'Y':
-			case 'Z':
-				replacer = tableau[12].charAt(tableauColumn); break;
-			default:
-				replacer = letter;
+			case 'A', 'B' -> replacer = tableau[0].charAt(tableauColumn);
+			case 'C', 'D' -> replacer = tableau[1].charAt(tableauColumn);
+			case 'E', 'F' -> replacer = tableau[2].charAt(tableauColumn);
+			case 'G', 'H' -> replacer = tableau[3].charAt(tableauColumn);
+			case 'I', 'J' -> replacer = tableau[4].charAt(tableauColumn);
+			case 'K', 'L' -> replacer = tableau[5].charAt(tableauColumn);
+			case 'M', 'N' -> replacer = tableau[6].charAt(tableauColumn);
+			case 'O', 'P' -> replacer = tableau[7].charAt(tableauColumn);
+			case 'Q', 'R' -> replacer = tableau[8].charAt(tableauColumn);
+			case 'S', 'T' -> replacer = tableau[9].charAt(tableauColumn);
+			case 'U', 'V' -> replacer = tableau[10].charAt(tableauColumn);
+			case 'W', 'X' -> replacer = tableau[11].charAt(tableauColumn);
+			case 'Y', 'Z' -> replacer = tableau[12].charAt(tableauColumn);
+			default -> replacer = letter;
 		}
 
 		return replacer;
diff --git a/src/main/java/com/mattrixwv/cipherstream/polysubstitution/PolybiusSquare.java b/src/main/java/com/mattrixwv/cipherstream/polysubstitution/PolybiusSquare.java
index 29ea26b..0521213 100644
--- a/src/main/java/com/mattrixwv/cipherstream/polysubstitution/PolybiusSquare.java
+++ b/src/main/java/com/mattrixwv/cipherstream/polysubstitution/PolybiusSquare.java
@@ -135,7 +135,7 @@ public class PolybiusSquare{
 		return cleanString;
 	}
 	protected String getPreparedInputStringDecoding(){
-		return inputString.replaceAll("[^0-9]", "");
+		return inputString.replaceAll("\\D", "");
 	}
 	//Strips invalid characters from the keyword and creates the grid
 	protected void setKeyword(String keyword){