CipherStream/CipherStreamAPI
1
0
Fork 0
Code Issues 3 Packages Projects Releases 1 Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Mattrixwv
2026-01-06 23:48:37 -05:00
parent d7c2591dab
commit b869f6bc28
77 changed files with 744 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/mattrixwv/cipherstream/aspect/CipherStreamLoggingAspect.java
View File

@@ -7,9 +7,8 @@ import org.aspectj.lang.annotation.Pointcut;
import org.slf4j.MDC;
import org.springframework.context.annotation.Configuration;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -38,8 +37,8 @@ public class CipherStreamLoggingAspect{
public void getCipherInfo(ObjectNode returnedJson){
//Extract JSON to MDC
returnedJson.properties().forEach(entry -> {
if(entry.getValue().isTextual()){
MDC.put(entry.getKey(), entry.getValue().asText());
if(entry.getValue().isString()){
MDC.put(entry.getKey(), entry.getValue().asString());
}
else{
MDC.put(entry.getKey(), entry.getValue().toString());

3
src/main/java/com/mattrixwv/cipherstream/config/FullFilter.java
View File

@@ -6,7 +6,6 @@ import java.util.StringJoiner;
import java.util.UUID;
import org.slf4j.MDC;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
@@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
@Component
public class FullFilter extends OncePerRequestFilter{
@Override
protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull FilterChain filterChain) throws ServletException, IOException{
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException{
if(!request.getMethod().equalsIgnoreCase("OPTIONS")){
setupMDC(request);
}

3
src/main/java/com/mattrixwv/cipherstream/config/WebConfig.java
View File

@@ -2,7 +2,6 @@ package com.mattrixwv.cipherstream.config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -17,7 +16,7 @@ public class WebConfig implements WebMvcConfigurer{
@Override
public void addCorsMappings(@NonNull CorsRegistry registry){
public void addCorsMappings(CorsRegistry registry){
registry.addMapping("/**")
.allowedOriginPatterns(allowedOrigins);
}

4
src/main/java/com/mattrixwv/cipherstream/controller/ExceptionRestController.java
View File

@@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.exception.InvalidCipherParameterException;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;
@Slf4j

14
src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgvxCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.combination.ADFGVX;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,9 +55,9 @@ public class AdfgvxCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
ADFGVX adfgvx = new ADFGVX(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -79,9 +79,9 @@ public class AdfgvxCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
ADFGVX adfgvx = new ADFGVX(preserveCapitals, preserveWhitespace, preserveSymbols);

14
src/main/java/com/mattrixwv/cipherstream/controller/combination/AdfgxCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.combination.ADFGX;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,9 +55,9 @@ public class AdfgxCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
ADFGX adfgx = new ADFGX(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -79,9 +79,9 @@ public class AdfgxCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String squareKeyword = cipherParams.get(CipherParameterUtil.SQUARE_KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
ADFGX adfgx = new ADFGX(preserveCapitals, preserveWhitespace, preserveSymbols);

6
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AffineCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Affine;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -57,7 +57,7 @@ public class AffineCipherController{
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int key1 = cipherParams.get(CipherParameterUtil.AFFINE_KEY_1).asInt();
int key2 = cipherParams.get(CipherParameterUtil.AFFINE_KEY_2).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Affine affine = new Affine(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -81,7 +81,7 @@ public class AffineCipherController{
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int key1 = cipherParams.get(CipherParameterUtil.AFFINE_KEY_1).asInt();
int key2 = cipherParams.get(CipherParameterUtil.AFFINE_KEY_2).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Affine affine = new Affine(preserveCapitals, preserveWhitespace, preserveSymbols);

6
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AtbashCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Atbash;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,7 +55,7 @@ public class AtbashCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Atbash atbash = new Atbash(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -77,7 +77,7 @@ public class AtbashCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Atbash atbash = new Atbash(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/AutokeyCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Autokey;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class AutokeyCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Autokey autokey = new Autokey(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class AutokeyCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Autokey autokey = new Autokey(preserveCapitals, preserveWhitespace, preserveSymbols);

6
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaconianCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Baconian;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -53,7 +53,7 @@ public class BaconianCipherController{
CipherParameterUtil.verifyBaconianParams(cipherParams);
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Baconian baconian = new Baconian(preserveCapitals);
@@ -73,7 +73,7 @@ public class BaconianCipherController{
CipherParameterUtil.verifyBaconianParams(cipherParams);
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Baconian baconian = new Baconian(preserveCapitals);

6
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BaseXCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.BaseX;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -52,7 +52,7 @@ public class BaseXCipherController{
CipherParameterUtil.verifyBaseXParams(cipherParams);
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
int base = cipherParams.get(CipherParameterUtil.BASE_X_BASE).asInt();
@@ -72,7 +72,7 @@ public class BaseXCipherController{
CipherParameterUtil.verifyBaseXParams(cipherParams);
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
int base = cipherParams.get(CipherParameterUtil.BASE_X_BASE).asInt();

10
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/BeaufortCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Beaufort;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class BeaufortCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Beaufort beaufort = new Beaufort(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class BeaufortCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Beaufort beaufort = new Beaufort(preserveCapitals, preserveWhitespace, preserveSymbols);

6
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/CaesarCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Caesar;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -56,7 +56,7 @@ public class CaesarCipherController{
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int shiftAmount = cipherParams.get(CipherParameterUtil.CAESAR_SHIFT_AMOUNT).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Caesar caesar = new Caesar(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -79,7 +79,7 @@ public class CaesarCipherController{
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int shiftAmount = cipherParams.get(CipherParameterUtil.CAESAR_SHIFT_AMOUNT).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Caesar caesar = new Caesar(preserveCapitals, preserveWhitespace, preserveSymbols);
String outputString = caesar.decode(shiftAmount, inputString);

10
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/OneTimePadCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.OneTimePad;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class OneTimePadCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
OneTimePad oneTimePad = new OneTimePad(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class OneTimePadCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
OneTimePad oneTimePad = new OneTimePad(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/PortaCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Porta;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class PortaCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Porta porta = new Porta(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class PortaCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Porta porta = new Porta(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/SubstitutionCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Substitution;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class SubstitutionCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Substitution substitution = new Substitution(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class SubstitutionCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Substitution substitution = new Substitution(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/monosubstitution/VigenereCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.monosubstitution.Vigenere;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class VigenereCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Vigenere vigenere = new Vigenere(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class VigenereCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Vigenere vigenere = new Vigenere(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/BifidCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.Bifid;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class BifidCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Bifid bifid = new Bifid(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class BifidCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Bifid bifid = new Bifid(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/ColumnarCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.Columnar;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class ColumnarCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Columnar columnar = new Columnar(preserveCapitals, preserveWhitespace, preserveSymbols, true);
@@ -78,8 +78,8 @@ public class ColumnarCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Columnar columnar = new Columnar(preserveCapitals, preserveWhitespace, preserveSymbols, true);

13
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/HillCipherController.java
View File

@@ -12,15 +12,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.Hill;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -48,7 +47,7 @@ public class HillCipherController{
}
@PostMapping("/encode")
public ObjectNode encodeHill(@RequestBody ObjectNode cipherParams) throws JsonProcessingException{
public ObjectNode encodeHill(@RequestBody ObjectNode cipherParams){
MDC.put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, hillName);
log.info("Encoding {}", hillName);
@@ -58,7 +57,7 @@ public class HillCipherController{
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int[][] key = new ObjectMapper().treeToValue(cipherParams.get(CipherParameterUtil.HILL_KEY), int[][].class);
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Hill hill = new Hill(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -71,7 +70,7 @@ public class HillCipherController{
}
@PostMapping("/decode")
public ObjectNode decodeHill(@RequestBody ObjectNode cipherParams) throws JsonProcessingException{
public ObjectNode decodeHill(@RequestBody ObjectNode cipherParams){
MDC.put(CipherStreamLoggingAspect.CIPHER_NAME_LOGGING, hillName);
log.info("Decoding {}", hillName);
@@ -81,7 +80,7 @@ public class HillCipherController{
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int[][] key = new ObjectMapper().treeToValue(cipherParams.get(CipherParameterUtil.HILL_KEY), int[][].class);
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Hill hill = new Hill(preserveCapitals, preserveWhitespace, preserveSymbols);

6
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/MorseCodeController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.Morse;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -52,7 +52,7 @@ public class MorseCodeController{
CipherParameterUtil.verifyMorseParams(cipherParams);
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Morse morse = new Morse();
@@ -71,7 +71,7 @@ public class MorseCodeController{
CipherParameterUtil.verifyMorseParams(cipherParams);
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Morse morse = new Morse();

10
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PlayfairCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.Playfair;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,8 +55,8 @@ public class PlayfairCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Playfair playfair = new Playfair(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -78,8 +78,8 @@ public class PlayfairCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Playfair playfair = new Playfair(preserveCapitals, preserveWhitespace, preserveSymbols);

10
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/PolybiusSquareController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.PolybiusSquare;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -54,8 +54,8 @@ public class PolybiusSquareController{
CipherParameterUtil.verifyPolybiusParams(cipherParams);
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
PolybiusSquare polybiusSquare = new PolybiusSquare(preserveWhitespace, preserveSymbols);
@@ -76,8 +76,8 @@ public class PolybiusSquareController{
CipherParameterUtil.verifyPolybiusParams(cipherParams);
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
PolybiusSquare polybiusSquare = new PolybiusSquare(preserveWhitespace, preserveSymbols);

6
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/RailFenceController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.RailFence;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -56,7 +56,7 @@ public class RailFenceController{
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int rails = cipherParams.get(CipherParameterUtil.RAIL_FENCE_RAILS).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
RailFence railFence = new RailFence(preserveCapitals, preserveWhitespace, preserveSymbols);
@@ -79,7 +79,7 @@ public class RailFenceController{
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
int rails = cipherParams.get(CipherParameterUtil.RAIL_FENCE_RAILS).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
RailFence railFence = new RailFence(preserveCapitals, preserveWhitespace, preserveSymbols);

14
src/main/java/com/mattrixwv/cipherstream/controller/polysubstitution/TrifidCipherController.java
View File

@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.aspect.CipherStreamLoggingAspect;
import com.mattrixwv.cipherstream.polysubstitution.Trifid;
import com.mattrixwv.cipherstream.utils.CipherInfoUtil;
import com.mattrixwv.cipherstream.utils.CipherParameterUtil;
import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.node.ObjectNode;
@Slf4j
@@ -55,10 +55,10 @@ public class TrifidCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
char fill = cipherParams.get(CipherParameterUtil.TRIFID_FILL).asText().charAt(0);
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
char fill = cipherParams.get(CipherParameterUtil.TRIFID_FILL).asString().charAt(0);
int groupLength = cipherParams.get(CipherParameterUtil.TRIFID_GROUP_LENGTH).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Trifid trifid = new Trifid(preserveCapitals, preserveWhitespace, preserveSymbols, fill);
@@ -80,10 +80,10 @@ public class TrifidCipherController{
boolean preserveCapitals = cipherParams.get(CipherParameterUtil.PRESERVE_CAPITALS).asBoolean();
boolean preserveWhitespace = cipherParams.get(CipherParameterUtil.PRESERVE_WHITESPACE).asBoolean();
boolean preserveSymbols = cipherParams.get(CipherParameterUtil.PRESERVE_SYMBOLS).asBoolean();
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asText();
char fill = cipherParams.get(CipherParameterUtil.TRIFID_FILL).asText().charAt(0);
String keyword = cipherParams.get(CipherParameterUtil.KEYWORD).asString();
char fill = cipherParams.get(CipherParameterUtil.TRIFID_FILL).asString().charAt(0);
int groupLength = cipherParams.get(CipherParameterUtil.TRIFID_GROUP_LENGTH).asInt();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asText();
String inputString = cipherParams.get(CipherParameterUtil.INPUT_STRING).asString();
Trifid trifid = new Trifid(preserveCapitals, preserveWhitespace, preserveSymbols, fill);

5
src/main/java/com/mattrixwv/cipherstream/utils/CipherInfoUtil.java
View File

@@ -3,10 +3,9 @@ package com.mattrixwv.cipherstream.utils;
import java.util.List;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.experimental.UtilityClass;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;
@UtilityClass

22
src/main/java/com/mattrixwv/cipherstream/utils/CipherParameterUtil.java
View File

@@ -1,10 +1,10 @@
package com.mattrixwv.cipherstream.utils;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.cipherstream.exception.InvalidCipherParameterException;
import lombok.experimental.UtilityClass;
import tools.jackson.databind.node.ObjectNode;
@UtilityClass
@@ -74,7 +74,7 @@ public class CipherParameterUtil{
if(!params.has(INPUT_STRING)){
throw new InvalidCipherParameterException(INPUT_STRING + PRESENT_MESSAGE);
}
if(!params.get(INPUT_STRING).isTextual()){
if(!params.get(INPUT_STRING).isString()){
throw new InvalidCipherParameterException(INPUT_STRING + TEXT_MESSAGE);
}
}
@@ -85,7 +85,7 @@ public class CipherParameterUtil{
if(!params.has(KEYWORD)){
throw new InvalidCipherParameterException(KEYWORD + PRESENT_MESSAGE);
}
if(!params.get(KEYWORD).isTextual()){
if(!params.get(KEYWORD).isString()){
throw new InvalidCipherParameterException(KEYWORD + TEXT_MESSAGE);
}
}
@@ -134,7 +134,7 @@ public class CipherParameterUtil{
if(!params.has(INPUT_STRING)){
throw new InvalidCipherParameterException(INPUT_STRING + PRESENT_MESSAGE);
}
if(!params.get(INPUT_STRING).isTextual()){
if(!params.get(INPUT_STRING).isString()){
throw new InvalidCipherParameterException(INPUT_STRING + TEXT_MESSAGE);
}
}
@@ -143,7 +143,7 @@ public class CipherParameterUtil{
if(!params.has(INPUT_STRING)){
throw new InvalidCipherParameterException(INPUT_STRING + PRESENT_MESSAGE);
}
if(!params.get(INPUT_STRING).isTextual()){
if(!params.get(INPUT_STRING).isString()){
throw new InvalidCipherParameterException(INPUT_STRING + TEXT_MESSAGE);
}
@@ -161,7 +161,7 @@ public class CipherParameterUtil{
if(!params.has(SQUARE_KEYWORD)){
throw new InvalidCipherParameterException(SQUARE_KEYWORD + PRESENT_MESSAGE);
}
if(!params.get(SQUARE_KEYWORD).isTextual()){
if(!params.get(SQUARE_KEYWORD).isString()){
throw new InvalidCipherParameterException(SQUARE_KEYWORD + TEXT_MESSAGE);
}
}
@@ -187,7 +187,7 @@ public class CipherParameterUtil{
if(!params.has(INPUT_STRING)){
throw new InvalidCipherParameterException(INPUT_STRING + PRESENT_MESSAGE);
}
if(!params.get(INPUT_STRING).isTextual()){
if(!params.get(INPUT_STRING).isString()){
throw new InvalidCipherParameterException(INPUT_STRING + TEXT_MESSAGE);
}
}
@@ -210,14 +210,14 @@ public class CipherParameterUtil{
if(!params.has(INPUT_STRING)){
throw new InvalidCipherParameterException(INPUT_STRING + PRESENT_MESSAGE);
}
if(!params.get(INPUT_STRING).isTextual()){
if(!params.get(INPUT_STRING).isString()){
throw new InvalidCipherParameterException(INPUT_STRING + TEXT_MESSAGE);
}
if(!params.has(KEYWORD)){
throw new InvalidCipherParameterException(KEYWORD + PRESENT_MESSAGE);
}
if(!params.get(KEYWORD).isTextual()){
if(!params.get(KEYWORD).isString()){
throw new InvalidCipherParameterException(KEYWORD + TEXT_MESSAGE);
}
}
@@ -239,10 +239,10 @@ public class CipherParameterUtil{
if(!params.has(TRIFID_FILL)){
throw new InvalidCipherParameterException(TRIFID_FILL + PRESENT_MESSAGE);
}
if(!params.get(TRIFID_FILL).isTextual()){
if(!params.get(TRIFID_FILL).isString()){
throw new InvalidCipherParameterException(TRIFID_FILL + TEXT_MESSAGE);
}
if(params.get(TRIFID_FILL).asText().length() > 1){
if(params.get(TRIFID_FILL).asString().length() > 1){
throw new InvalidCipherParameterException(TRIFID_FILL + CHARACTER_MESSAGE);
}