From 988ee75b1903c7664f49818b520722cb64f18f86 Mon Sep 17 00:00:00 2001 From: Matthew Ellison Date: Wed, 17 Apr 2024 10:25:41 -0400 Subject: [PATCH] Update path mapping --- .../controller/combination/AdfgvxCipherController.java | 2 +- .../controller/combination/AdfgxCipherController.java | 2 +- .../controller/monosubstitution/AffineCipherController.java | 2 +- .../controller/monosubstitution/AtbashCipherController.java | 2 +- .../controller/monosubstitution/AutokeyCipherController.java | 2 +- .../monosubstitution/BaconianCipherController.java | 2 +- .../controller/monosubstitution/BaseXCipherController.java | 2 +- .../monosubstitution/BeaufortCipherController.java | 2 +- .../controller/monosubstitution/CaesarCipherController.java | 2 +- .../monosubstitution/OneTimePadCipherController.java | 2 +- .../controller/monosubstitution/PortaCipherController.java | 2 +- .../monosubstitution/SubstitutionCipherController.java | 2 +- .../monosubstitution/VigenereCipherController.java | 2 +- .../controller/polysubstitution/BifidCipherController.java | 2 +- .../polysubstitution/ColumnarCipherController.java | 2 +- .../controller/polysubstitution/HillCipherController.java | 2 +- .../controller/polysubstitution/MorseCodeController.java | 2 +- .../polysubstitution/PlayfairCipherController.java | 2 +- .../polysubstitution/PolybiusSquareController.java | 2 +- .../controller/polysubstitution/RailFenceController.java | 2 +- .../controller/polysubstitution/TrifidCipherController.java | 2 +- .../cipherstream/config/FullFilterIntegrationTest.java | 5 +++-- .../combination/AdfgvxCipherControllerIntegrationTest.java | 2 +- .../combination/AdfgxCipherControllerIntegrationTest.java | 2 +- .../AffineCipherControllerIntegrationTest.java | 2 +- .../AtbashCipherControllerIntegrationTest.java | 2 +- .../AutokeyCipherControllerIntegrationTest.java | 2 +- .../BaconianCipherControllerIntegrationTest.java | 2 +- .../BaseXCipherControllerIntegrationTest.java | 2 +- .../BeaufortCipherControllerIntegrationTest.java | 2 +- .../CaesarCipherControllerIntegrationTest.java | 2 +- .../OneTimePadCipherControllerIntegrationTest.java | 2 +- .../PortaCipherControllerIntegrationTest.java | 2 +- .../SubstitutionCipherControllerIntegrationTest.java | 2 +- .../VigenereCipherControllerIntegrationTest.java | 2 +- .../BifidCipherControllerIntegrationTest.java | 2 +- .../ColumnarCipherControllerIntegrationTest.java | 2 +- .../HillCipherControllerIntegrationTest.java | 2 +- .../polysubstitution/MorseCodeControllerIntegrationTest.java | 2 +- .../PlayfairCipherControllerIntegrationTest.java | 2 +- .../PolybiusSquareControllerIntegrationTest.java | 2 +- .../polysubstitution/RailFenceControllerIntegrationTest.java | 2 +- .../TrifidCipherControllerIntegrationTest.java | 2 +- 43 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherController.java index 77f44a8..608284a 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/adfgvx") +@RequestMapping("/adfgvx") public class AdfgvxCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherController.java index c89f1d0..694e24a 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/adfgx") +@RequestMapping("/adfgx") public class AdfgxCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherController.java index 0b9f400..6a4a823 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/affine") +@RequestMapping("/affine") public class AffineCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherController.java index bfa7837..1fc6115 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/atbash") +@RequestMapping("/atbash") public class AtbashCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherController.java index 654f2d6..3f06bb5 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/autokey") +@RequestMapping("/autokey") public class AutokeyCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherController.java index 4e630f7..1362409 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/baconian") +@RequestMapping("/baconian") public class BaconianCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherController.java index 6768fde..768b123 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/basex") +@RequestMapping("/basex") public class BaseXCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherController.java index 92e1e80..13e780a 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/beaufort") +@RequestMapping("/beaufort") public class BeaufortCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherController.java index f833773..d161fd5 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/caesar") +@RequestMapping("/caesar") public class CaesarCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherController.java index d3a668a..c11f00a 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/oneTimePad") +@RequestMapping("/oneTimePad") public class OneTimePadCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherController.java index 0cec1cd..e96bde3 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/porta") +@RequestMapping("/porta") public class PortaCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherController.java index 64188b0..6c2458f 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/substitution") +@RequestMapping("/substitution") public class SubstitutionCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherController.java index fae44a8..1f2c2d9 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/vigenere") +@RequestMapping("/vigenere") public class VigenereCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherController.java index 6b784eb..da482f0 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/bifid") +@RequestMapping("/bifid") public class BifidCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherController.java index bc3c430..915df13 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/columnar") +@RequestMapping("/columnar") public class ColumnarCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherController.java index e929585..3319c06 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherController.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/hill") +@RequestMapping("/hill") public class HillCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeController.java index 1854f47..0ee3f8c 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/morse") +@RequestMapping("/morse") public class MorseCodeController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherController.java index a407292..221da59 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/playfair") +@RequestMapping("/playfair") public class PlayfairCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareController.java index 38e295f..a1610fc 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/polybius") +@RequestMapping("/polybius") public class PolybiusSquareController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceController.java index 72291ff..807fcf7 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/railFence") +@RequestMapping("/railFence") public class RailFenceController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherController.java b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherController.java index b713035..75e84d2 100644 --- a/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherController.java +++ b/src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherController.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @RestController -@RequestMapping("/cipherStream/trifid") +@RequestMapping("/trifid") public class TrifidCipherController{ @GetMapping public ObjectNode getCipherInfo(){ diff --git a/src/test/java/com/mattrixwv/cipherstream/config/FullFilterIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/config/FullFilterIntegrationTest.java index cc794b5..39b091c 100644 --- a/src/test/java/com/mattrixwv/cipherstream/config/FullFilterIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/config/FullFilterIntegrationTest.java @@ -40,13 +40,14 @@ public class FullFilterIntegrationTest{ @Mock private MDCAdapter mdc; //Fields + private static final String url = "/caesar"; private UUID requestId = UUID.randomUUID(); private String ipAddresses = "192.168.1.1,192.168.1.2,192.168.1.3"; @Test public void testDoFilterInternal() throws Exception{ - mockMvc.perform(get("/cipherStream/caesar") + mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddresses) .param("param1", "value1") @@ -63,7 +64,7 @@ public class FullFilterIntegrationTest{ @Test public void testDoFilterInternal_NoParameters() throws Exception{ - mockMvc.perform(get("/cipherStream/caesar") + mockMvc.perform(get(url) .header("X-Request-Id", requestId) .header("X-Forwarded-For", ipAddresses)) .andExpect(status().isOk()); diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java index 6390eb3..e5ce5fe 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class AdfgvxCipherControllerIntegrationTest extends CipherStreamControlle @Mock(name = "com.mattrixwv.cipherstream.controller.combination.AdfgvxCipherController") private Logger adfgvxLogger; //Fields - private String url = "/cipherStream/adfgvx"; + private String url = "/adfgvx"; private String decodedString = "Message to^encode"; private String encodedString = "AXgvdavfxgagfa afag^aaxdxfgdagda"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java index 303cd1a..731b123 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class AdfgxCipherControllerIntegrationTest extends CipherStreamController @Mock(name = "com.mattrixwv.cipherstream.controller.combination.AdfgxCipherController") private Logger adfgxLogger; //Fields - private String url = "/cipherStream/adfgx"; + private String url = "/adfgx"; private String decodedString = "Message to^encode"; private String encodedString = "AAgagadfagaxxd axdx^adafafxddgdf"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java index 73a2797..937ff19 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class AffineCipherControllerIntegrationTest extends CipherStreamControlle @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.AffineCipherController") private Logger affineLogger; //Fields - private String url = "/cipherStream/affine"; + private String url = "/affine"; private String decodedString = "Message to^encode"; private String encodedString = "Pbtthlb yz^burzwb"; private int key1 = 5; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java index afd59e7..a9b76c2 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class AtbashCipherControllerIntegrationTest extends CipherStreamControlle @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.AtbashCipherController") protected Logger atbashLogger; //Fields - private String url = "/cipherStream/atbash"; + private String url = "/atbash"; private String decodedString = "Message to^encode"; private String encodedString = "Nvhhztv gl^vmxlwv"; private static final ObjectNode blankNode = mapper.createObjectNode(); diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java index 44b1a17..4a28793 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class AutokeyCipherControllerIntegrationTest extends CipherStreamControll @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.AutokeyCipherController") protected Logger autokeyLogger; //Fields - private String url = "/cipherStream/autokey"; + private String url = "/autokey"; private String decodedString = "Message to^encode"; private String encodedString = "Wiqooxh fs^wfcuhx"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java index 42de63e..9eb2765 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class BaconianCipherControllerIntegrationTest extends CipherStreamControl @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.BaconianCipherController") protected Logger baconianLogger; //Fields - private String url = "/cipherStream/baconian"; + private String url = "/baconian"; private String decodedString = "Message to^encode"; private String encodedString = "ABABB aabaa baaab baaab aaaaa aabba aabaa baaba abbab aabaa abbaa aaaba abbab aaabb aabaa"; private static final ObjectNode blankNode = mapper.createObjectNode(); diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java index 4be4686..1980bc7 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class BaseXCipherControllerIntegrationTest extends CipherStreamController @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.BaseXCipherController") protected Logger baseXLogger; //Fields - private String url = "/cipherStream/basex"; + private String url = "/basex"; private String decodedString = "A+B@C d\te\nf"; private String encodedString = "1000001 101011 1000010 1000000 1000011 100000 1100100 1001 1100101 1010 1100110"; private int base = 2; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java index 2fe85ba..1c88021 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class BeaufortCipherControllerIntegrationTest extends CipherStreamControl @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.BeaufortCipherController") protected Logger beaufortLogger; //Fields - private String url = "/cipherStream/beaufort"; + private String url = "/beaufort"; private String decodedString = "Message to^encode"; private String encodedString = "Yageolz rq^ujmdag"; private String keyword = "Ke*y word"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java index bc25728..e755ee0 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class CaesarCipherControllerIntegrationTest extends CipherStreamControlle @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.CaesarCipherController") protected Logger caesarLogger; //Fields - private String url = "/cipherStream/caesar"; + private String url = "/caesar"; private String decodedString = "The quick brown fox jumps over - the lazy dog"; private String encodedString = "Qeb nrfzh yoltk clu grjmp lsbo - qeb ixwv ald"; private int shiftAmount = 23; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java index 941d4de..d72d582 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class OneTimePadCipherControllerIntegrationTest extends CipherStreamContr @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.OneTimePadCipherController") protected Logger oneTimePadLogger; //Fields - private String url = "/cipherStream/oneTimePad"; + private String url = "/oneTimePad"; private String decodedString = "Message to^encode"; private String encodedString = "Wiqooxh mv^egkgws"; private String keyword = "keywordThatIsTotallyRandom"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java index f4ddbf2..cebb466 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherControllerIntegrationTest.java @@ -32,7 +32,7 @@ public class PortaCipherControllerIntegrationTest extends CipherStreamController @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.PortaCipherController") protected Logger portaLogger; //Fields - private String url = "/cipherStream/porta"; + private String url = "/porta"; private String decodedString = "Message to^encode"; private String encodedString = "Rtghuos bm^qcwgrw"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java index d446733..d6dd0ba 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class SubstitutionCipherControllerIntegrationTest extends CipherStreamCon @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.SubstitutionCipherController") protected Logger substitutionLogger; //Fields - private String url = "/cipherStream/substitution"; + private String url = "/substitution"; private String decodedString = "Message to^encode"; private String encodedString = "Oguucig vq^gpeqfg"; private String keyword = "cdefghijklmnopqrstuvwxyzab"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java index 6ae36e9..4164d0b 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class VigenereCipherControllerIntegrationTest extends CipherStreamControl @Mock(name = "com.mattrixwv.cipherstream.controller.monosubstitution.VigenereCipherController") protected Logger vigenereLogger; //Fields - private String url = "/cipherStream/vigenere"; + private String url = "/vigenere"; private String decodedString = "Message to^encode"; private String encodedString = "Wiqooxh ds^cjqfgo"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java index 5543bc5..c6ee258 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class BifidCipherControllerIntegrationTest extends CipherStreamController @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.BifidCipherController") protected Logger bifidLogger; //Fields - private String url = "/cipherStream/bifid"; + private String url = "/bifid"; private String decodedString = "Message to^encode"; private String encodedString = "Mqaokne kc^vdodzd"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java index 0208512..995c236 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class ColumnarCipherControllerIntegrationTest extends CipherStreamControl @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.ColumnarCipherController") protected Logger columnarLogger; //Fields - private String url = "/cipherStream/columnar"; + private String url = "/columnar"; private String decodedString = "Message to^encode"; private String encodedString = "Edeomte ac^gosnse"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java index 1ef8a46..771affc 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class HillCipherControllerIntegrationTest extends CipherStreamControllerI @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.HillCipherController") protected Logger hillLogger; //Fields - private String url = "/cipherStream/hill"; + private String url = "/hill"; private String decodedString = "Message to^encoded"; private String encodedString = "Mgkeqge ul^ikhisplrd"; private int[][] keyArray = new int[][]{{1, 4, 2}, {2, 4, 1}, {4, 1, 2}}; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java index c43533e..1fb4c30 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class MorseCodeControllerIntegrationTest extends CipherStreamControllerIn @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.MorseCodeController") protected Logger morseLogger; //Fields - private String url = "/cipherStream/morse"; + private String url = "/morse"; private String decodedString = "Message to^encode123"; private String encodedString = "-- . ... ... .- --. . - --- . -. -.-. --- -.. . .---- ..--- ...--"; private static final ObjectNode blankNode = mapper.createObjectNode(); diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java index 01a1214..cc788bc 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class PlayfairCipherControllerIntegrationTest extends CipherStreamControl @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.PlayfairCipherController") protected Logger playfairLogger; //Fields - private String url = "/cipherStream/playfair"; + private String url = "/playfair"; private String decodedString = "Hide the gold in - the@tree+stump"; private String decodedStringPadded = "Hide the gold in - the@trexe+stump"; private String encodedString = "Bmod zbx dnab ek - udm@uixmm+ouvif"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java index 789400c..8d904c7 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class PolybiusSquareControllerIntegrationTest extends CipherStreamControl @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.PolybiusSquareController") protected Logger polybiusLogger; //Fields - private String url = "/cipherStream/polybius"; + private String url = "/polybius"; private String decodedString = "Message to^encode"; private String encodedString = "41124545233212 5115^124225152212"; private String keyword = "keyword"; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java index 0fa8976..dd3c5c0 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class RailFenceControllerIntegrationTest extends CipherStreamControllerIn @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.RailFenceController") protected Logger railFenceLogger; //Fields - private String url = "/cipherStream/railFence"; + private String url = "/railFence"; private String decodedString = "Message to^encode"; private String encodedString = "Maooesg te^cdsene"; private int rails = 3; diff --git a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java index 784d890..68a54e9 100644 --- a/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java +++ b/src/test/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherControllerIntegrationTest.java @@ -31,7 +31,7 @@ public class TrifidCipherControllerIntegrationTest extends CipherStreamControlle @Mock(name = "com.mattrixwv.cipherstream.controller.polysubstitution.TrifidCipherController") protected Logger trifidLogger; //Fields - private String url = "/cipherStream/trifid"; + private String url = "/trifid"; private String decodedString = "Message to^encode+"; private String encodedString = "Gqdokpd od^ljvflf+"; private String keyword = "keyword";