[shardingsphere] branch master updated (93606ea3b27 -> e55d4506239)

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chengzhang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


    from 93606ea3b27 Merge like encryptor spi to encryptor spi (#25528)
     new 1cd906bb2ac Split assisted encrypt algorithm to AssistedEncryptAlgorithm api interface
     new 4a85b1c2705 fix unit test
     new 0a9db9d318c fix checkstyle
     new 7e912bf87d8 fix unit test
     new e55d4506239 Merge pull request #25529 from strongduanmu/dev-0509

The 38638 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../TestQueryAssistedShardingEncryptAlgorithm.java |  9 +---
 .../TestQueryAssistedShardingEncryptAlgorithm.ftl  |  9 +---
 .../AssistedEncryptAlgorithm.java}                 |  6 +--
 .../MD5AssistedEncryptAlgorithm.java}              | 13 ++----
 .../{encrypt => standard}/AESEncryptAlgorithm.java |  2 +-
 .../{encrypt => standard}/RC4EncryptAlgorithm.java |  2 +-
 .../merge/dql/EncryptAlgorithmMetaData.java        | 10 ++--
 .../encrypt/merge/dql/EncryptMergedResult.java     |  2 +-
 .../EncryptAssignmentParameterRewriter.java        |  2 +-
 ...OnDuplicateKeyUpdateValueParameterRewriter.java |  5 +-
 .../EncryptInsertValueParameterRewriter.java       | 26 +++++------
 .../generator/EncryptAlterTableTokenGenerator.java | 18 ++++----
 .../generator/EncryptAssignmentTokenGenerator.java |  2 +-
 .../EncryptCreateTableTokenGenerator.java          |  2 +-
 .../EncryptIndexColumnTokenGenerator.java          |  2 +-
 .../EncryptInsertOnUpdateTokenGenerator.java       |  8 ++--
 .../EncryptInsertValuesTokenGenerator.java         | 18 ++++----
 .../generator/EncryptProjectionTokenGenerator.java |  2 +-
 .../shardingsphere/encrypt/rule/EncryptRule.java   | 53 +++++++++++++---------
 ...che.shardingsphere.encrypt.spi.EncryptAlgorithm |  6 +--
 .../MD5AssistedEncryptAlgorithmTest.java}          | 17 +++----
 .../AESEncryptAlgorithmTest.java                   |  2 +-
 .../RC4EncryptAlgorithmTest.java                   |  2 +-
 .../CoreQueryAssistedEncryptAlgorithmFixture.java  |  9 +---
 .../merge/dql/EncryptAlgorithmMetaDataTest.java    | 18 ++++----
 .../impl/EncryptAlterTableTokenGeneratorTest.java  |  4 +-
 .../impl/EncryptCreateTableTokenGeneratorTest.java |  2 +-
 .../impl/EncryptOrderByItemTokenGeneratorTest.java |  2 +-
 .../EncryptInsertOnUpdateTokenGeneratorTest.java   |  4 +-
 .../EncryptAssignmentTokenGeneratorTest.java       |  2 +-
 .../fixture/EncryptGeneratorFixtureBuilder.java    |  7 +--
 .../encrypt/rule/EncryptRuleTest.java              | 26 ++++++-----
 .../config/ProxyConfigurationLoaderTest.java       |  7 +--
 .../conf/config_loader/config-encrypt.yaml         |  8 ++--
 .../resources/conf/convert/config-encrypt.yaml     | 10 ++--
 .../test/resources/conf/convert/config-mix.yaml    | 10 ++--
 .../test/resources/conf/import/config-encrypt.yaml |  8 ++--
 .../test/resources/expected/convert-encrypt.yaml   |  4 +-
 .../src/test/resources/expected/convert-mix.yaml   |  4 +-
 .../src/main/resources/conf/config-encrypt.yaml    | 16 ++++---
 .../JDBCQueryAssistedEncryptAlgorithmFixture.java  |  9 +---
 ...ewriteQueryAssistedEncryptAlgorithmFixture.java | 12 +----
 42 files changed, 186 insertions(+), 194 deletions(-)
 copy features/encrypt/api/src/main/java/org/apache/shardingsphere/encrypt/api/encrypt/{like/LikeEncryptAlgorithm.java => assisted/AssistedEncryptAlgorithm.java} (84%)
 rename features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/{encrypt/MD5EncryptAlgorithm.java => assisted/MD5AssistedEncryptAlgorithm.java} (77%)
 rename features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/{encrypt => standard}/AESEncryptAlgorithm.java (98%)
 rename features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/{encrypt => standard}/RC4EncryptAlgorithm.java (98%)
 rename features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/algorithm/{encrypt/MD5EncryptAlgorithmTest.java => assisted/MD5AssistedEncryptAlgorithmTest.java} (82%)
 rename features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/algorithm/{encrypt => standard}/AESEncryptAlgorithmTest.java (98%)
 rename features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/algorithm/{encrypt => standard}/RC4EncryptAlgorithmTest.java (98%)