You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/13 01:36:29 UTC
[shardingsphere] branch master updated: Revise pr 22808 for code style (#22842)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 93de41032c2 Revise pr 22808 for code style (#22842)
93de41032c2 is described below
commit 93de41032c29b0e251e5d923b7e803cf9522b522
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Tue Dec 13 09:36:22 2022 +0800
Revise pr 22808 for code style (#22842)
---
.../cover/KeepFirstNLastMMaskAlgorithm.java | 2 +-
.../algorithm/cover/KeepFromXToYMaskAlgorithm.java | 2 +-
.../cover/MaskFirstNLastMMaskAlgorithm.java | 46 +++++++++++-----------
.../algorithm/cover/MaskFromXToYMaskAlgorithm.java | 44 +++++++++++----------
.../KeepFirstNLastMMaskAlgorithmTest.java | 3 +-
.../{ => cover}/KeepFromXToYMaskAlgorithmTest.java | 4 +-
.../cover/MaskFirstNLastMMaskAlgorithmTest.java | 16 ++++----
.../cover/MaskFromXToYMaskAlgorithmTest.java | 22 ++++++-----
8 files changed, 72 insertions(+), 67 deletions(-)
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java
index ca50840ebe8..3b1baad5c23 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java
@@ -70,7 +70,7 @@ public final class KeepFirstNLastMMaskAlgorithm implements MaskAlgorithm<Object,
@Override
public String mask(final Object plainValue) {
- String result = String.valueOf(plainValue);
+ String result = null == plainValue ? null : String.valueOf(plainValue);
if (Strings.isNullOrEmpty(result)) {
return result;
}
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
index 128f24b9c06..bf0c8623604 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
@@ -70,7 +70,7 @@ public final class KeepFromXToYMaskAlgorithm implements MaskAlgorithm<Object, St
@Override
public String mask(final Object plainValue) {
- String result = String.valueOf(plainValue);
+ String result = null == plainValue ? null : String.valueOf(plainValue);
if (Strings.isNullOrEmpty(result)) {
return result;
}
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java
index 114667614df..7730580bf03 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java
@@ -44,46 +44,46 @@ public final class MaskFirstNLastMMaskAlgorithm implements MaskAlgorithm<Object,
@Getter
private Properties props;
- @Override
- public String mask(final Object plainValue) {
- String result = String.valueOf(plainValue);
- if (Strings.isNullOrEmpty(result)) {
- return result;
- }
- char[] chars = result.toCharArray();
- for (int i = 0, len = Math.min(firstN, chars.length); i < len; i++) {
- chars[i] = replaceChar;
- }
- for (int i = chars.length - Math.min(lastM, chars.length); i < chars.length; i++) {
- chars[i] = replaceChar;
- }
- return new String(chars);
- }
-
@Override
public void init(final Properties props) {
this.props = props;
- this.firstN = getN(props);
- this.lastM = getM(props);
- this.replaceChar = getReplaceChar(props);
+ this.firstN = createFirstN(props);
+ this.lastM = createLastM(props);
+ this.replaceChar = createReplaceChar(props);
}
- private Integer getN(final Properties props) {
+ private Integer createFirstN(final Properties props) {
Preconditions.checkArgument(props.containsKey(FIRST_N), "%s can not be null.", FIRST_N);
return Integer.parseInt(props.getProperty(FIRST_N));
}
- private Integer getM(final Properties props) {
+ private Integer createLastM(final Properties props) {
Preconditions.checkArgument(props.containsKey(LAST_M), "%s can not be null.", LAST_M);
return Integer.parseInt(props.getProperty(LAST_M));
}
- private Character getReplaceChar(final Properties props) {
+ private Character createReplaceChar(final Properties props) {
Preconditions.checkArgument(props.containsKey(REPLACE_CHAR), "%s can not be null.", REPLACE_CHAR);
- Preconditions.checkArgument(1 == props.getProperty(REPLACE_CHAR).length(), "%s length must be 1.", REPLACE_CHAR);
+ Preconditions.checkArgument(1 == props.getProperty(REPLACE_CHAR).length(), "%s's length must be one.", REPLACE_CHAR);
return props.getProperty(REPLACE_CHAR).charAt(0);
}
+ @Override
+ public String mask(final Object plainValue) {
+ String result = null == plainValue ? null : String.valueOf(plainValue);
+ if (Strings.isNullOrEmpty(result)) {
+ return result;
+ }
+ char[] chars = result.toCharArray();
+ for (int i = 0, len = Math.min(firstN, chars.length); i < len; i++) {
+ chars[i] = replaceChar;
+ }
+ for (int i = chars.length - Math.min(lastM, chars.length); i < chars.length; i++) {
+ chars[i] = replaceChar;
+ }
+ return new String(chars);
+ }
+
@Override
public String getType() {
return "MASK_FIRST_N_LAST_M";
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
index 3e33e0fcb66..4d4f7f02521 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import lombok.Getter;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -43,43 +44,46 @@ public final class MaskFromXToYMaskAlgorithm implements MaskAlgorithm<Object, St
@Getter
private Properties props;
- @Override
- public String mask(final Object plainValue) {
- String value = plainValue == null ? "" : plainValue.toString();
- if ("".equals(value) || value.length() <= fromX || toY < fromX) {
- return value;
- }
- char[] chars = value.toCharArray();
- for (int i = fromX, len = Math.min(toY, chars.length - 1); i <= len; i++) {
- chars[i] = replaceChar;
- }
- return new String(chars);
- }
-
@Override
public void init(final Properties props) {
this.props = props;
- this.fromX = getX(props);
- this.toY = getY(props);
- this.replaceChar = getReplaceChar(props);
+ this.fromX = createFromX(props);
+ this.toY = createToY(props);
+ this.replaceChar = createReplaceChar(props);
}
- private Integer getX(final Properties props) {
+ private Integer createFromX(final Properties props) {
Preconditions.checkArgument(props.containsKey(FROM_X), "%s can not be null.", FROM_X);
return Integer.parseInt(props.getProperty(FROM_X));
}
- private Integer getY(final Properties props) {
+ private Integer createToY(final Properties props) {
Preconditions.checkArgument(props.containsKey(TO_Y), "%s can not be null.", TO_Y);
return Integer.parseInt(props.getProperty(TO_Y));
}
- private Character getReplaceChar(final Properties props) {
+ private Character createReplaceChar(final Properties props) {
Preconditions.checkArgument(props.containsKey(REPLACE_CHAR), "%s can not be null.", REPLACE_CHAR);
- Preconditions.checkArgument(1 == props.getProperty(REPLACE_CHAR).length(), "%s length must be 1.", REPLACE_CHAR);
+ Preconditions.checkArgument(1 == props.getProperty(REPLACE_CHAR).length(), "%s's length must be one.", REPLACE_CHAR);
return props.getProperty(REPLACE_CHAR).charAt(0);
}
+ @Override
+ public String mask(final Object plainValue) {
+ String result = null == plainValue ? null : String.valueOf(plainValue);
+ if (Strings.isNullOrEmpty(result)) {
+ return result;
+ }
+ if (result.length() <= fromX || toY < fromX) {
+ return result;
+ }
+ char[] chars = result.toCharArray();
+ for (int i = fromX, minLength = Math.min(toY, chars.length - 1); i <= minLength; i++) {
+ chars[i] = replaceChar;
+ }
+ return new String(chars);
+ }
+
@Override
public String getType() {
return "MASK_FROM_X_TO_Y";
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/KeepFirstNLastMMaskAlgorithmTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithmTest.java
similarity index 94%
rename from features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/KeepFirstNLastMMaskAlgorithmTest.java
rename to features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithmTest.java
index 5d5e75073f2..08cc5797571 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/KeepFirstNLastMMaskAlgorithmTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithmTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.algorithm;
+package org.apache.shardingsphere.mask.algorithm.cover;
-import org.apache.shardingsphere.mask.algorithm.cover.KeepFirstNLastMMaskAlgorithm;
import org.junit.Before;
import org.junit.Test;
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/KeepFromXToYMaskAlgorithmTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithmTest.java
similarity index 91%
rename from features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/KeepFromXToYMaskAlgorithmTest.java
rename to features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithmTest.java
index 8434f96abf1..7d274dda08a 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/KeepFromXToYMaskAlgorithmTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithmTest.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mask.algorithm;
+package org.apache.shardingsphere.mask.algorithm.cover;
-import org.apache.shardingsphere.mask.algorithm.cover.KeepFirstNLastMMaskAlgorithm;
-import org.apache.shardingsphere.mask.algorithm.cover.KeepFromXToYMaskAlgorithm;
import org.junit.Before;
import org.junit.Test;
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithmTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithmTest.java
index 3741b9391ee..91bd8d0c6cb 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithmTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithmTest.java
@@ -27,27 +27,27 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class MaskFirstNLastMMaskAlgorithmTest {
- private MaskFirstNLastMMaskAlgorithm algorithm;
+ private MaskFirstNLastMMaskAlgorithm maskAlgorithm;
@Before
public void setUp() {
- algorithm = new MaskFirstNLastMMaskAlgorithm();
- algorithm.init(createProperties("3", "5", "*"));
+ maskAlgorithm = new MaskFirstNLastMMaskAlgorithm();
+ maskAlgorithm.init(createProperties("3", "5", "*"));
}
@Test
public void assertMask() {
- assertThat(algorithm.mask("abc12345678"), is("***123*****"));
+ assertThat(maskAlgorithm.mask("abc12345678"), is("***123*****"));
}
@Test
- public void assertMaskWithShortPlainValue() {
- assertThat(algorithm.mask("ab"), is("**"));
+ public void assertMaskWhenPlainValueLengthLessThanFirstN() {
+ assertThat(maskAlgorithm.mask("ab"), is("**"));
}
@Test(expected = IllegalArgumentException.class)
- public void assertMaskWithInvalidProperties() {
- algorithm.init(createProperties("", "5", "*"));
+ public void assertInitWhenConfigWrongProps() {
+ maskAlgorithm.init(createProperties("", "3", "+"));
}
private Properties createProperties(final String firstN, final String lastM, final String replaceChar) {
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithmTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithmTest.java
index 748b17670a4..558c8175cb5 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithmTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithmTest.java
@@ -27,28 +27,32 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class MaskFromXToYMaskAlgorithmTest {
- private MaskFromXToYMaskAlgorithm algorithm;
+ private MaskFromXToYMaskAlgorithm maskAlgorithm;
@Before
public void setUp() {
- algorithm = new MaskFromXToYMaskAlgorithm();
- algorithm.init(createProperties("3", "5", "*"));
+ maskAlgorithm = new MaskFromXToYMaskAlgorithm();
+ maskAlgorithm.init(createProperties("3", "5", "*"));
}
@Test
public void assertMask() {
- assertThat(algorithm.mask("abc12345"), is("abc***45"));
+ assertThat(maskAlgorithm.mask("abc12345"), is("abc***45"));
}
@Test
- public void assertMaskWithShortPlainValue() {
- assertThat(algorithm.mask("ab"), is("ab"));
- assertThat(algorithm.mask("abc1"), is("abc*"));
+ public void assertMaskWhenPlainValueLengthLessThanFromX() {
+ assertThat(maskAlgorithm.mask("ab"), is("ab"));
+ }
+
+ @Test
+ public void assertMaskWhenPlainValueLengthLessThanToY() {
+ assertThat(maskAlgorithm.mask("abc1"), is("abc*"));
}
@Test(expected = IllegalArgumentException.class)
- public void assertMaskWithInvalidProperties() {
- algorithm.init(createProperties("5", "", "*"));
+ public void assertInitWhenConfigWrongProps() {
+ maskAlgorithm.init(createProperties("5", "", "+"));
}
private Properties createProperties(final String fromX, final String toY, final String replaceChar) {