@@ -1408,8 +1408,7 @@ public static PortionBuilder portion() {
14081408 * A builder for obfuscators that obfuscate a specific portion of their input.
14091409 * An obfuscator created with {@link #keepAtStart(int) keepAtStart(x)} and {@link #keepAtEnd(int) keepAtEnd(y)} will, for input {@code s},
14101410 * obfuscate all characters in the range {@code x} (inclusive) to {@link CharSequence#length() s.length()}{@code - y} (exclusive).
1411- * If this range is empty, such an obfuscator will not obfuscate anything, unless if {@link #withFixedTotalLength(int)} or
1412- * {@link #withFixedLength(int)} is specified.
1411+ * If this range is empty, such an obfuscator will not obfuscate anything, unless if {@link #withFixedTotalLength(int)} is specified.
14131412 *
14141413 * @author Rob Spoor
14151414 */
@@ -1420,7 +1419,6 @@ public static final class PortionBuilder {
14201419 private int atLeastFromStart ;
14211420 private int atLeastFromEnd ;
14221421 private int fixedTotalLength ;
1423- private int fixedObfuscatedLength ;
14241422 private char maskChar ;
14251423
14261424 private PortionBuilder () {
@@ -1507,23 +1505,6 @@ public PortionBuilder withFixedTotalLength(int fixedTotalLength) {
15071505 return this ;
15081506 }
15091507
1510- /**
1511- * Sets or removes the fixed number of {@link #withMaskChar(char) mask characters} to use for obfuscating.
1512- * <p>
1513- * This setting will be ignored if the {@link #withFixedTotalLength(int) fixed total length} is set.
1514- *
1515- * @param fixedObfuscatedLength The fixed number of mask characters, or a negative value to use the actual length of the input.
1516- * The default is {@code -1}.
1517- * @return This builder.
1518- * @deprecated The total length of obfuscated contents can vary when using this setting, making it possible in certain cases to find the
1519- * original value that was obfuscated. Use {@link #withFixedTotalLength(int)} instead.
1520- */
1521- @ Deprecated
1522- public PortionBuilder withFixedLength (int fixedObfuscatedLength ) {
1523- this .fixedObfuscatedLength = Math .max (-1 , fixedObfuscatedLength );
1524- return this ;
1525- }
1526-
15271508 /**
15281509 * Sets the char that created obfuscators use for obfuscating.
15291510 *
@@ -1544,7 +1525,6 @@ public PortionBuilder withMaskChar(char maskChar) {
15441525 * <li>{@link #atLeastFromStart(int) atLeastFromStart(0)}</li>
15451526 * <li>{@link #atLeastFromEnd(int) atLeastFromEnd(0)}</li>
15461527 * <li>{@link #withFixedTotalLength(int) withFixedTotalLength(-1)}</li>
1547- * <li>{@link #withFixedLength(int) withFixedLength(-1)}</li>
15481528 * <li>{@link #withMaskChar(char) withMaskChar('*')}</li>
15491529 * </ul>
15501530 *
@@ -1556,7 +1536,6 @@ public PortionBuilder withDefaults() {
15561536 atLeastFromStart (0 );
15571537 atLeastFromEnd (0 );
15581538 withFixedTotalLength (-1 );
1559- withFixedLength (-1 );
15601539 withMaskChar (DEFAULT_MASK_CHAR );
15611540 return this ;
15621541 }
@@ -1593,7 +1572,6 @@ private static final class PortionObfuscator extends Obfuscator {
15931572 private final int atLeastFromStart ;
15941573 private final int atLeastFromEnd ;
15951574 private final int fixedTotalLength ;
1596- private final int fixedObfuscatedLength ;
15971575 private final char maskChar ;
15981576
15991577 private PortionObfuscator (PortionBuilder builder ) {
@@ -1602,7 +1580,6 @@ private PortionObfuscator(PortionBuilder builder) {
16021580 this .atLeastFromStart = builder .atLeastFromStart ;
16031581 this .atLeastFromEnd = builder .atLeastFromEnd ;
16041582 this .fixedTotalLength = builder .fixedTotalLength ;
1605- this .fixedObfuscatedLength = builder .fixedObfuscatedLength ;
16061583 this .maskChar = builder .maskChar ;
16071584
16081585 if (fixedTotalLength >= 0 && fixedTotalLength < keepAtStart + keepAtEnd ) {
@@ -1650,9 +1627,6 @@ public CharSequence obfuscateText(CharSequence s, int start, int end) {
16501627
16511628 if (fixedTotalLength >= 0 ) {
16521629 length = fixedTotalLength ;
1653- } else if (fixedObfuscatedLength >= 0 ) {
1654- // length - fromStart - fromEnd needs to be fixedObfuscatedLength, so length needs to be fixedObfuscatedLength + fromStart + fromEnd
1655- length = fixedObfuscatedLength + fromStart + fromEnd ;
16561630 }
16571631
16581632 char [] array = new char [length ];
@@ -1680,9 +1654,6 @@ public void obfuscateText(CharSequence s, int start, int end, Appendable destina
16801654
16811655 if (fixedTotalLength >= 0 ) {
16821656 length = fixedTotalLength ;
1683- } else if (fixedObfuscatedLength >= 0 ) {
1684- // length - fromStart - fromEnd needs to be fixedObfuscatedLength, so length needs to be fixedObfuscatedLength + fromStart + fromEnd
1685- length = fixedObfuscatedLength + fromStart + fromEnd ;
16861657 }
16871658
16881659 // first build the content as expected: 0 to fromStart non-obfuscated, then obfuscated, then end - fromEnd non-obfuscated
@@ -1723,14 +1694,13 @@ public boolean equals(Object o) {
17231694 PortionObfuscator other = (PortionObfuscator ) o ;
17241695 return keepAtStart == other .keepAtStart && keepAtEnd == other .keepAtEnd
17251696 && atLeastFromStart == other .atLeastFromStart && atLeastFromEnd == other .atLeastFromEnd
1726- && fixedObfuscatedLength == other .fixedObfuscatedLength
17271697 && fixedTotalLength == other .fixedTotalLength
17281698 && maskChar == other .maskChar ;
17291699 }
17301700
17311701 @ Override
17321702 public int hashCode () {
1733- return keepAtStart ^ keepAtEnd ^ atLeastFromStart ^ atLeastFromEnd ^ fixedObfuscatedLength ^ fixedTotalLength ^ maskChar ;
1703+ return keepAtStart ^ keepAtEnd ^ atLeastFromStart ^ atLeastFromEnd ^ fixedTotalLength ^ maskChar ;
17341704 }
17351705
17361706 @ Override
@@ -1751,9 +1721,6 @@ public String toString() {
17511721 if (atLeastFromEnd > 0 ) {
17521722 sb .append ("atLeastFromEnd=" ).append (atLeastFromEnd ).append (',' );
17531723 }
1754- if (fixedObfuscatedLength >= 0 ) {
1755- sb .append ("fixedLength=" ).append (fixedObfuscatedLength ).append (',' );
1756- }
17571724 if (fixedTotalLength >= 0 ) {
17581725 sb .append ("fixedTotalLength=" ).append (fixedTotalLength ).append (',' );
17591726 }
0 commit comments