[shardingsphere] branch master updated: Minor change for SPI (#12183)

[wuweijie]

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

wuweijie 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 e13e6fc  Minor change for SPI (#12183)
e13e6fc is described below

commit e13e6fcb98ee985b5c2fe0e6d1c329d34abd0771
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Fri Sep 3 00:39:04 2021 +0800

    Minor change for SPI (#12183)
    
    * Code format for OrderedServicesCache
    
    * Refactor OrderedServicesCache
    
    * Refactor MetadataRefresher
    
    * For code format
---
 .../infra/metadata/MetadataRefresher.java            |  4 ++--
 .../infra/metadata/schema/model/TableMetaData.java   |  4 ++--
 .../spi/ordered/cache/OrderedServicesCache.java      | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java
index 6d5eb2f..a516c24 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/MetadataRefresher.java
@@ -32,10 +32,10 @@ public interface MetadataRefresher {
      *
      * @param rules rules to be find
      * @param clazz target class
-     * @param <R> type of target class
+     * @param <T> type of rule
      * @return found rules
      */
-    default <R extends ShardingSphereRule> Collection<R> 
findShardingSphereRulesByClass(final Collection<ShardingSphereRule> rules, 
final Class<R> clazz) {
+    default <T extends ShardingSphereRule> Collection<T> 
findShardingSphereRulesByClass(final Collection<ShardingSphereRule> rules, 
final Class<T> clazz) {
         return rules.stream().filter(each -> 
clazz.isAssignableFrom(each.getClass())).map(clazz::cast).collect(Collectors.toList());
     }
 }
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
index dd0a255..c8d09a7 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaData.java
@@ -51,11 +51,11 @@ public final class TableMetaData {
     public TableMetaData() {
         this("", Collections.emptyList(), Collections.emptyList());
     }
-
+    
     public TableMetaData(final String name) {
         this(name, Collections.emptyList(), Collections.emptyList());
     }
-
+    
     public TableMetaData(final String name, final Collection<ColumnMetaData> 
columnMetaDataList, final Collection<IndexMetaData> indexMetaDataList) {
         this.name = name;
         columns = getColumns(columnMetaDataList);
diff --git 
a/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/ordered/cache/OrderedServicesCache.java
 
b/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/ordered/cache/OrderedServicesCache.java
index 5b487c7..c43651c 100644
--- 
a/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/ordered/cache/OrderedServicesCache.java
+++ 
b/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/ordered/cache/OrderedServicesCache.java
@@ -39,31 +39,31 @@ public final class OrderedServicesCache {
     /**
      * Find cached services.
      * 
-     * @param orderedSPIClass class of ordered SPI
+     * @param spiClass SPI class
      * @param types types
-     * @return cached ordered services
+     * @return cached services
      */
-    public static Optional<Map<?, ?>> findCachedServices(final Class<?> 
orderedSPIClass, final Collection<?> types) {
-        return Optional.ofNullable(CACHED_SERVICES.getIfPresent(new 
Key(orderedSPIClass, types)));
+    public static Optional<Map<?, ?>> findCachedServices(final Class<?> 
spiClass, final Collection<?> types) {
+        return Optional.ofNullable(CACHED_SERVICES.getIfPresent(new 
Key(spiClass, types)));
     }
     
     /**
      * Cache services.
      * 
-     * @param orderedSPIClass class of ordered SPI
+     * @param spiClass SPI class
      * @param types types
-     * @param services ordered services
+     * @param services services to be cached
      */
-    public static void cacheServices(final Class<?> orderedSPIClass, final 
Collection<?> types, final Map<?, ?> services) {
-        CACHED_SERVICES.put(new Key(orderedSPIClass, types), services);
+    public static void cacheServices(final Class<?> spiClass, final 
Collection<?> types, final Map<?, ?> services) {
+        CACHED_SERVICES.put(new Key(spiClass, types), services);
     }
     
     @RequiredArgsConstructor
     @EqualsAndHashCode
     private static final class Key {
-    
+        
         private final Class<?> clazz;
-    
+        
         private final Collection<?> types;
     }
 }