This is an automated email from the ASF dual-hosted git repository.
panjuan 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 fb0ccf79c85 Fix java doc on EncryptColumn and EncryptColumnItem
(#26045)
fb0ccf79c85 is described below
commit fb0ccf79c85ec3762bef221b21329f1f499e618f
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jun 5 06:28:47 2023 +0800
Fix java doc on EncryptColumn and EncryptColumnItem (#26045)
---
.../shardingsphere/encrypt/rule/EncryptColumn.java | 4 +-
.../encrypt/rule/EncryptColumnItem.java | 2 +-
.../shardingsphere/encrypt/rule/EncryptTable.java | 64 +++++++++++-----------
3 files changed, 35 insertions(+), 35 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
index 53a739c44ff..485d45a0d4a 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumn.java
@@ -40,7 +40,7 @@ public final class EncryptColumn {
private EncryptColumnItem likeQuery;
/**
- * Get assisted query.
+ * Get assisted query column item.
*
* @return assisted query column item
*/
@@ -49,7 +49,7 @@ public final class EncryptColumn {
}
/**
- * Get like query.
+ * Get like query column item.
*
* @return like query column item
*/
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
index 27bbdf01832..29c5e4a7b37 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptColumnItem.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Encrypt column.
+ * Encrypt column item.
*/
@RequiredArgsConstructor
@Getter
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
index b9dbbbf8fbb..c63a6f664e6 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
@@ -62,39 +62,39 @@ public final class EncryptTable {
}
/**
- * Find encrypt algorithm name.
+ * Find encryptor name.
*
- * @param logicColumn column name
+ * @param logicColumnName logic column name
* @return encrypt algorithm name
*/
- public Optional<String> findEncryptorName(final String logicColumn) {
- return columns.containsKey(logicColumn) ?
Optional.of(columns.get(logicColumn).getCipher().getEncryptorName()) :
Optional.empty();
+ public Optional<String> findEncryptorName(final String logicColumnName) {
+ return columns.containsKey(logicColumnName) ?
Optional.of(columns.get(logicColumnName).getCipher().getEncryptorName()) :
Optional.empty();
}
/**
- * Find assisted query encrypt algorithm name.
+ * Find assisted query encryptor name.
*
- * @param logicColumn column name
- * @return assist encrypt algorithm name
+ * @param logicColumnName logic column name
+ * @return assist query encryptor name
*/
- public Optional<String> findAssistedQueryEncryptorName(final String
logicColumn) {
- return columns.containsKey(logicColumn) ?
columns.get(logicColumn).getAssistedQuery().map(EncryptColumnItem::getEncryptorName)
: Optional.empty();
+ public Optional<String> findAssistedQueryEncryptorName(final String
logicColumnName) {
+ return columns.containsKey(logicColumnName) ?
columns.get(logicColumnName).getAssistedQuery().map(EncryptColumnItem::getEncryptorName)
: Optional.empty();
}
/**
* Find like query encrypt algorithm name.
*
- * @param logicColumn column name
+ * @param logicColumnName logic column name
* @return like encrypt algorithm name
*/
- public Optional<String> findLikeQueryEncryptorName(final String
logicColumn) {
- return columns.containsKey(logicColumn) ?
columns.get(logicColumn).getLikeQuery().map(EncryptColumnItem::getEncryptorName)
: Optional.empty();
+ public Optional<String> findLikeQueryEncryptorName(final String
logicColumnName) {
+ return columns.containsKey(logicColumnName) ?
columns.get(logicColumnName).getLikeQuery().map(EncryptColumnItem::getEncryptorName)
: Optional.empty();
}
/**
* Get logic columns.
*
- * @return logic column
+ * @return logic column names
*/
public Collection<String> getLogicColumns() {
return columns.keySet();
@@ -103,37 +103,37 @@ public final class EncryptTable {
/**
* Get logic column by cipher column.
*
- * @param cipherColumn cipher column
+ * @param cipherColumnName cipher column name
* @return logic column
* @throws EncryptLogicColumnNotFoundException encrypt logic column not
found exception
*/
- public String getLogicColumnByCipherColumn(final String cipherColumn) {
+ public String getLogicColumnByCipherColumn(final String cipherColumnName) {
for (Entry<String, EncryptColumn> entry : columns.entrySet()) {
- if
(entry.getValue().getCipher().getName().equalsIgnoreCase(cipherColumn)) {
+ if
(entry.getValue().getCipher().getName().equalsIgnoreCase(cipherColumnName)) {
return entry.getKey();
}
}
- throw new EncryptLogicColumnNotFoundException(cipherColumn);
+ throw new EncryptLogicColumnNotFoundException(cipherColumnName);
}
/**
* Is cipher column or not.
*
- * @param columnName column name
+ * @param logicColumnName logic column name
* @return cipher column or not
*/
- public boolean isCipherColumn(final String columnName) {
- return columns.values().stream().anyMatch(each ->
each.getCipher().getName().equalsIgnoreCase(columnName));
+ public boolean isCipherColumn(final String logicColumnName) {
+ return columns.values().stream().anyMatch(each ->
each.getCipher().getName().equalsIgnoreCase(logicColumnName));
}
/**
* Get cipher column.
*
- * @param logicColumn logic column name
+ * @param logicColumnName logic column name
* @return cipher column
*/
- public String getCipherColumn(final String logicColumn) {
- return columns.get(logicColumn).getCipher().getName();
+ public String getCipherColumn(final String logicColumnName) {
+ return columns.get(logicColumnName).getCipher().getName();
}
/**
@@ -169,21 +169,21 @@ public final class EncryptTable {
/**
* Find assisted query column.
*
- * @param logicColumn column name
+ * @param logicColumnName logic column name
* @return assisted query column
*/
- public Optional<String> findAssistedQueryColumn(final String logicColumn) {
- return columns.containsKey(logicColumn) ?
columns.get(logicColumn).getAssistedQuery().map(EncryptColumnItem::getName) :
Optional.empty();
+ public Optional<String> findAssistedQueryColumn(final String
logicColumnName) {
+ return columns.containsKey(logicColumnName) ?
columns.get(logicColumnName).getAssistedQuery().map(EncryptColumnItem::getName)
: Optional.empty();
}
/**
* Find like query column.
*
- * @param logicColumn column name
+ * @param logicColumnName column name
* @return like query column
*/
- public Optional<String> findLikeQueryColumn(final String logicColumn) {
- return columns.containsKey(logicColumn) ?
columns.get(logicColumn).getLikeQuery().map(EncryptColumnItem::getName) :
Optional.empty();
+ public Optional<String> findLikeQueryColumn(final String logicColumnName) {
+ return columns.containsKey(logicColumnName) ?
columns.get(logicColumnName).getLikeQuery().map(EncryptColumnItem::getName) :
Optional.empty();
}
/**
@@ -202,11 +202,11 @@ public final class EncryptTable {
/**
* Find encrypt column.
*
- * @param logicColumn logic column
+ * @param logicColumnName logic column name
* @return encrypt column
*/
- public Optional<EncryptColumn> findEncryptColumn(final String logicColumn)
{
- return Optional.ofNullable(columns.get(logicColumn));
+ public Optional<EncryptColumn> findEncryptColumn(final String
logicColumnName) {
+ return Optional.ofNullable(columns.get(logicColumnName));
}
}
