Update tests to include MDC changes

pom.xml

@@ -178,7 +178,6 @@
 					<classpathDependencyExcludes>
 						<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
 					</classpathDependencyExcludes>
-					<argLine>${argLine} -XX:+EnableDynamicAgentLoading</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -210,7 +209,6 @@
 							<classpathDependencyExcludes>
 								<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
 							</classpathDependencyExcludes>
-							<argLine>${argLine} -XX:+EnableDynamicAgentLoading</argLine>
 						</configuration>
 					</execution>
 				</executions>

src/test/java/com/mattrixwv/cipherstream/config/FullFilterTest.java

@@ -49,6 +49,7 @@ public class FullFilterTest{
 
 		verify(request, times(2)).getHeader("X-Request-Id");
 		verify(request, times(2)).getHeader("X-Forwarded-For");
+		verify(request, times(1)).getParameterMap();
 		verify(filterChain, times(1)).doFilter(request, response);
 	}
 
@@ -65,6 +66,22 @@ public class FullFilterTest{
 
 		verify(request, times(2)).getHeader("X-Request-Id");
 		verify(request, times(2)).getHeader("X-Forwarded-For");
+		verify(request, times(1)).getParameterMap();
+		verify(filterChain, times(1)).doFilter(request, response);
+	}
+
+	@Test
+	public void testDoFilterInternal_noHeaders() throws Exception{
+		doReturn(new HashMap<>()).when(request).getParameterMap();
+		doReturn("/testURL").when(request).getRequestURI();
+
+
+		fullFilter.doFilterInternal(request, response, filterChain);
+
+
+		verify(request, times(1)).getHeader("X-Request-Id");
+		verify(request, times(1)).getHeader("X-Forwarded-For");
+		verify(request, times(1)).getParameterMap();
 		verify(filterChain, times(1)).doFilter(request, response);
 	}
 }

src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -76,6 +77,7 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url);
 		//Controller
 		verify(adfgvxLogger, times(1)).info("Getting info for {}", CipherInfoUtil.ADFGVX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGVX_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -95,6 +97,7 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(adfgvxLogger, times(1)).info("Encoding {}", CipherInfoUtil.ADFGVX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGVX_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -114,6 +117,7 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(adfgvxLogger, times(1)).info("Encoding {}", CipherInfoUtil.ADFGVX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGVX_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -133,6 +137,7 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(adfgvxLogger, times(1)).info("Decoding {}", CipherInfoUtil.ADFGVX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGVX_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -152,6 +157,7 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(adfgvxLogger, times(1)).info("Decoding {}", CipherInfoUtil.ADFGVX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGVX_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -76,6 +77,7 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url);
 		//Controller
 		verify(adfgxLogger, times(1)).info("Getting info for {}", CipherInfoUtil.ADFGX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGX_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -95,6 +97,7 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(adfgxLogger, times(1)).info("Encoding {}", CipherInfoUtil.ADFGX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGX_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -114,6 +117,7 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(adfgxLogger, times(1)).info("Encoding {}", CipherInfoUtil.ADFGX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGX_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -133,6 +137,7 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(adfgxLogger, times(1)).info("Decoding {}", CipherInfoUtil.ADFGX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGX_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -152,6 +157,7 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(adfgxLogger, times(1)).info("Decoding {}", CipherInfoUtil.ADFGX_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ADFGX_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -76,6 +77,7 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url);
 		//Controller
 		verify(affineLogger, times(1)).info("Getting info for {}", CipherInfoUtil.AFFINE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AFFINE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -95,6 +97,7 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(affineLogger, times(1)).info("Encoding {}", CipherInfoUtil.AFFINE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AFFINE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -114,6 +117,7 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(affineLogger, times(1)).info("Encoding {}", CipherInfoUtil.AFFINE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AFFINE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -133,6 +137,7 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(affineLogger, times(1)).info("Decoding {}", CipherInfoUtil.AFFINE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AFFINE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -152,6 +157,7 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(affineLogger, times(1)).info("Decoding {}", CipherInfoUtil.AFFINE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AFFINE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -70,6 +71,7 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url);
 		//Controller
 		verify(atbashLogger, times(1)).info("Getting info for {}", CipherInfoUtil.ATBASH_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ATBASH_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -89,6 +91,7 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(atbashLogger, times(1)).info("Encoding {}", CipherInfoUtil.ATBASH_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ATBASH_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -108,6 +111,7 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(atbashLogger, times(1)).info("Encoding {}", CipherInfoUtil.ATBASH_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ATBASH_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -127,6 +131,7 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(atbashLogger, times(1)).info("Decoding {}", CipherInfoUtil.ATBASH_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ATBASH_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -146,6 +151,7 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(atbashLogger, times(1)).info("Decoding {}", CipherInfoUtil.ATBASH_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ATBASH_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll
 		super.verifyFilter(url);
 		//Controller
 		verify(autokeyLogger, times(1)).info("Getting info for {}", CipherInfoUtil.AUTOKEY_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AUTOKEY_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(autokeyLogger, times(1)).info("Encoding {}", CipherInfoUtil.AUTOKEY_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AUTOKEY_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(autokeyLogger, times(1)).info("Encoding {}", CipherInfoUtil.AUTOKEY_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AUTOKEY_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(autokeyLogger, times(1)).info("Decoding {}", CipherInfoUtil.AUTOKEY_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AUTOKEY_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(autokeyLogger, times(1)).info("Decoding {}", CipherInfoUtil.AUTOKEY_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.AUTOKEY_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -70,6 +71,7 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url);
 		//Controller
 		verify(baconianLogger, times(1)).info("Getting info for {}", CipherInfoUtil.BACONIAN_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BACONIAN_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -89,6 +91,7 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(baconianLogger, times(1)).info("Encoding {}", CipherInfoUtil.BACONIAN_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BACONIAN_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -108,6 +111,7 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(baconianLogger, times(1)).info("Encoding {}", CipherInfoUtil.BACONIAN_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BACONIAN_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -127,6 +131,7 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(baconianLogger, times(1)).info("Decoding {}", CipherInfoUtil.BACONIAN_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BACONIAN_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -146,6 +151,7 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(baconianLogger, times(1)).info("Decoding {}", CipherInfoUtil.BACONIAN_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BACONIAN_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url);
 		//Controller
 		verify(baseXLogger, times(1)).info("Getting info for {}", CipherInfoUtil.BASE_X_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BASE_X_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(baseXLogger, times(1)).info("Encoding {}", CipherInfoUtil.BASE_X_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BASE_X_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(baseXLogger, times(1)).info("Encoding {}", CipherInfoUtil.BASE_X_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BASE_X_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(baseXLogger, times(1)).info("Decoding {}", CipherInfoUtil.BASE_X_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BASE_X_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(baseXLogger, times(1)).info("Decoding {}", CipherInfoUtil.BASE_X_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BASE_X_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url);
 		//Controller
 		verify(beaufortLogger, times(1)).info("Getting info for {}", CipherInfoUtil.BEAUFORT_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BEAUFORT_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(beaufortLogger, times(1)).info("Encoding {}", CipherInfoUtil.BEAUFORT_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BEAUFORT_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(beaufortLogger, times(1)).info("Encoding {}", CipherInfoUtil.BEAUFORT_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BEAUFORT_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(beaufortLogger, times(1)).info("Decoding {}", CipherInfoUtil.BEAUFORT_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BEAUFORT_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(beaufortLogger, times(1)).info("Decoding {}", CipherInfoUtil.BEAUFORT_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BEAUFORT_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url);
 		//Controller
 		verify(caesarLogger, times(1)).info("Getting info for {}", CipherInfoUtil.CAESAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.CAESAR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(caesarLogger, times(1)).info("Encoding {}", CipherInfoUtil.CAESAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.CAESAR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(caesarLogger, times(1)).info("Encoding {}", CipherInfoUtil.CAESAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.CAESAR_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(caesarLogger, times(1)).info("Decoding {}", CipherInfoUtil.CAESAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.CAESAR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(caesarLogger, times(1)).info("Decoding {}", CipherInfoUtil.CAESAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.CAESAR_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr
 		super.verifyFilter(url);
 		//Controller
 		verify(oneTimePadLogger, times(1)).info("Getting info for {}", CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(oneTimePadLogger, times(1)).info("Encoding {}", CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(oneTimePadLogger, times(1)).info("Encoding {}", CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(oneTimePadLogger, times(1)).info("Decoding {}", CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(oneTimePadLogger, times(1)).info("Decoding {}", CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.ONE_TIME_PAD_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java

@@ -17,6 +17,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -74,6 +75,7 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url);
 		//Controller
 		verify(portaLogger, times(1)).info("Getting info for {}", CipherInfoUtil.PORTA_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PORTA_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -97,6 +99,7 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController
 		verify(mdc, times(1)).clear();
 		//Controller
 		verify(portaLogger, times(1)).info("Encoding {}", CipherInfoUtil.PORTA_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PORTA_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -116,6 +119,7 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(portaLogger, times(1)).info("Encoding {}", CipherInfoUtil.PORTA_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PORTA_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -139,6 +143,7 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController
 		verify(mdc, times(1)).clear();
 		//Controller
 		verify(portaLogger, times(1)).info("Decoding {}", CipherInfoUtil.PORTA_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PORTA_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -158,6 +163,7 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(portaLogger, times(1)).info("Decoding {}", CipherInfoUtil.PORTA_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PORTA_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon
 		super.verifyFilter(url);
 		//Controller
 		verify(substitutionLogger, times(1)).info("Getting info for {}", CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(substitutionLogger, times(1)).info("Encoding {}", CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(substitutionLogger, times(1)).info("Encoding {}", CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(substitutionLogger, times(1)).info("Decoding {}", CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(substitutionLogger, times(1)).info("Decoding {}", CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.SUBSTITUTION_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url);
 		//Controller
 		verify(vigenereLogger, times(1)).info("Getting info for {}", CipherInfoUtil.VIGENERE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.VIGENERE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(vigenereLogger, times(1)).info("Encoding {}", CipherInfoUtil.VIGENERE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.VIGENERE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(vigenereLogger, times(1)).info("Encoding {}", CipherInfoUtil.VIGENERE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.VIGENERE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(vigenereLogger, times(1)).info("Decoding {}", CipherInfoUtil.VIGENERE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.VIGENERE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(vigenereLogger, times(1)).info("Decoding {}", CipherInfoUtil.VIGENERE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.VIGENERE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url);
 		//Controller
 		verify(bifidLogger, times(1)).info("Getting info for {}", CipherInfoUtil.BIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(bifidLogger, times(1)).info("Encoding {}", CipherInfoUtil.BIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(bifidLogger, times(1)).info("Encoding {}", CipherInfoUtil.BIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(bifidLogger, times(1)).info("Decoding {}", CipherInfoUtil.BIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(bifidLogger, times(1)).info("Decoding {}", CipherInfoUtil.BIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.BIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url);
 		//Controller
 		verify(columnarLogger, times(1)).info("Getting info for {}", CipherInfoUtil.COLUMNAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.COLUMNAR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(columnarLogger, times(1)).info("Encoding {}", CipherInfoUtil.COLUMNAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.COLUMNAR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(columnarLogger, times(1)).info("Encoding {}", CipherInfoUtil.COLUMNAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.COLUMNAR_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(columnarLogger, times(1)).info("Decoding {}", CipherInfoUtil.COLUMNAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.COLUMNAR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(columnarLogger, times(1)).info("Decoding {}", CipherInfoUtil.COLUMNAR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.COLUMNAR_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI
 		super.verifyFilter(url);
 		//Controller
 		verify(hillLogger, times(1)).info("Getting info for {}", CipherInfoUtil.HILL_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.HILL_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(hillLogger, times(1)).info("Encoding {}", CipherInfoUtil.HILL_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.HILL_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(hillLogger, times(1)).info("Encoding {}", CipherInfoUtil.HILL_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.HILL_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(hillLogger, times(1)).info("Decoding {}", CipherInfoUtil.HILL_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.HILL_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(hillLogger, times(1)).info("Decoding {}", CipherInfoUtil.HILL_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.HILL_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -63,6 +64,7 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url);
 		//Controller
 		verify(morseLogger, times(1)).info("Getting info for {}", CipherInfoUtil.MORSE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.MORSE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -82,6 +84,7 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(morseLogger, times(1)).info("Encoding {}", CipherInfoUtil.MORSE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.MORSE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -101,6 +104,7 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(morseLogger, times(1)).info("Encoding {}", CipherInfoUtil.MORSE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.MORSE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -120,6 +124,7 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(morseLogger, times(1)).info("Decoding {}", CipherInfoUtil.MORSE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.MORSE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -139,6 +144,7 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(morseLogger, times(1)).info("Decoding {}", CipherInfoUtil.MORSE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.MORSE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -74,6 +75,7 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url);
 		//Controller
 		verify(playfairLogger, times(1)).info("Getting info for {}", CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -93,6 +95,7 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(playfairLogger, times(1)).info("Encoding {}", CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -112,6 +115,7 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(playfairLogger, times(1)).info("Encoding {}", CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -131,6 +135,7 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(playfairLogger, times(1)).info("Decoding {}", CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -150,6 +155,7 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(playfairLogger, times(1)).info("Decoding {}", CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.PLAYFAIR_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url);
 		//Controller
 		verify(polybiusLogger, times(1)).info("Getting info for {}", CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(polybiusLogger, times(1)).info("Encoding {}", CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(polybiusLogger, times(1)).info("Encoding {}", CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(polybiusLogger, times(1)).info("Decoding {}", CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(polybiusLogger, times(1)).info("Decoding {}", CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.POLYBIUS_SQUARE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -73,6 +74,7 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url);
 		//Controller
 		verify(railFenceLogger, times(1)).info("Getting info for {}", CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -92,6 +94,7 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(railFenceLogger, times(1)).info("Encoding {}", CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -111,6 +114,7 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(railFenceLogger, times(1)).info("Encoding {}", CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -130,6 +134,7 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(railFenceLogger, times(1)).info("Decoding {}", CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -149,6 +154,7 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(railFenceLogger, times(1)).info("Decoding {}", CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.RAIL_FENCE_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}

src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
 import com.mattrixwv.cipherstream.controller.CipherStreamControllerIntegrationTestBase;
 import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
 import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
@@ -79,6 +80,7 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url);
 		//Controller
 		verify(trifidLogger, times(1)).info("Getting info for {}", CipherInfoUtil.TRIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.TRIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", infoNode);
 	}
@@ -98,6 +100,7 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(trifidLogger, times(1)).info("Encoding {}", CipherInfoUtil.TRIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.TRIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", decodedNode);
 	}
@@ -117,6 +120,7 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/encode");
 		//Controller
 		verify(trifidLogger, times(1)).info("Encoding {}", CipherInfoUtil.TRIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.TRIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}
@@ -136,6 +140,7 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(trifidLogger, times(1)).info("Decoding {}", CipherInfoUtil.TRIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.TRIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verify(aspectLogger, times(1)).info("CipherStream log {}", encodedNode);
 	}
@@ -155,6 +160,7 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle
 		super.verifyFilter(url + "/decode");
 		//Controller
 		verify(trifidLogger, times(1)).info("Decoding {}", CipherInfoUtil.TRIFID_CIPHER_NAME);
+		verify(mdc, times(1)).put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, CipherInfoUtil.TRIFID_CIPHER_NAME);
 		//Cipher Aspect
 		verifyNoInteractions(aspectLogger);
 	}