Skip to content

Commit 71532d9

Browse files
author
jdvega
committed
move validation to object creation
1 parent 58d82bd commit 71532d9

File tree

4 files changed

+9
-45
lines changed

4 files changed

+9
-45
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
target/
55
.idea/
66
*.iml
7-
*.asc
7+
*.asc

src/main/java/com/idealista/fpe/FormatPreservingEncryption.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static com.idealista.fpe.FormatPreservingEncryptionErrorMessage.*;
44

55
import com.idealista.fpe.algorithm.Cipher;
6-
import com.idealista.fpe.builder.AlgorithmInput;
6+
import com.idealista.fpe.builder.validate.BuildValidator;
77
import com.idealista.fpe.component.functions.prf.PseudoRandomFunction;
88
import com.idealista.fpe.config.Domain;
99
import com.idealista.fpe.config.LengthRange;
@@ -15,11 +15,12 @@ public class FormatPreservingEncryption {
1515
private final PseudoRandomFunction selectedPRF;
1616
private final LengthRange lengthRange;
1717

18-
public FormatPreservingEncryption(AlgorithmInput algorithmInput) {
19-
this.cipher = algorithmInput.getCipher();
20-
this.selectedDomain = algorithmInput.getSelectedDomain();
21-
this.selectedPRF = algorithmInput.getSelectedPRF();
22-
this.lengthRange = algorithmInput.getLengthRange();
18+
public FormatPreservingEncryption(Cipher cipher, Domain selectedDomain, PseudoRandomFunction selectedPRF, LengthRange lengthRange) {
19+
new BuildValidator(selectedDomain.alphabet().radix(), lengthRange.min(), lengthRange.max()).validate();
20+
this.cipher = cipher;
21+
this.selectedDomain = selectedDomain;
22+
this.selectedPRF = selectedPRF;
23+
this.lengthRange = lengthRange;
2324
}
2425

2526
public String encrypt(String plainText, byte[] tweak) {

src/main/java/com/idealista/fpe/builder/AlgorithmInput.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/main/java/com/idealista/fpe/builder/FormatPreservingEncryptionBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ private TheBuilder(Cipher cipher, Domain selectedDomain, PseudoRandomFunction se
103103

104104
@Override
105105
public FormatPreservingEncryption build() {
106-
new BuildValidator(selectedDomain.alphabet().radix(), lengthRange.min(), lengthRange.max()).validate();
107-
return new FormatPreservingEncryption(new AlgorithmInput(cipher, selectedDomain, selectedPRF, lengthRange));
106+
return new FormatPreservingEncryption(cipher, selectedDomain, selectedPRF, lengthRange);
108107
}
109108
}
110109
}

0 commit comments

Comments
 (0)