From 88e7be875752132f7d379ca8a3b8ddefb18822f3 Mon Sep 17 00:00:00 2001
From: TaoZhi <UIT_TAOZHI@163.com>
Date: Fri, 3 Apr 2020 18:11:47 +0800
Subject: [PATCH] Fix param check of KeyGeneratorConfiguration (#5052)

* check whether the type of keyGenerateAlgorithm is null.

* add use="required" on attribute column of element key-generator.
---
 .../yaml/swapper/KeyGeneratorConfigurationYamlSwapper.java    | 4 +++-
 .../src/main/resources/META-INF/namespace/sharding.xsd        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/yaml/swapper/KeyGeneratorConfigurationYamlSwapper.java b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/yaml/swapper/KeyGeneratorConfigurationYamlSwapper.java
index 0a91bdb68a..c49386d0cf 100644
--- a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/yaml/swapper/KeyGeneratorConfigurationYamlSwapper.java
+++ b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/yaml/swapper/KeyGeneratorConfigurationYamlSwapper.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.core.yaml.swapper;
 
+import com.google.common.base.Strings;
 import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
 import org.apache.shardingsphere.core.yaml.config.sharding.YamlKeyGeneratorConfiguration;
 import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
@@ -44,7 +45,8 @@ public final class KeyGeneratorConfigurationYamlSwapper implements YamlSwapper<Y
     
     @Override
     public KeyGeneratorConfiguration swap(final YamlKeyGeneratorConfiguration yamlConfiguration) {
-        KeyGenerateAlgorithm keyGenerateAlgorithm = TypedSPIRegistry.getRegisteredService(KeyGenerateAlgorithm.class, yamlConfiguration.getType(), yamlConfiguration.getProps());
+        KeyGenerateAlgorithm keyGenerateAlgorithm = !Strings.isNullOrEmpty(yamlConfiguration.getType())
+                ? TypedSPIRegistry.getRegisteredService(KeyGenerateAlgorithm.class, yamlConfiguration.getType(), yamlConfiguration.getProps()) : null;
         return new KeyGeneratorConfiguration(yamlConfiguration.getColumn(), keyGenerateAlgorithm);
     }
 }
diff --git a/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd b/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd
index ba5ebc7d30..d8e0692a4e 100644
--- a/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd
+++ b/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd
@@ -143,7 +143,7 @@
     <xsd:element name="key-generator">
         <xsd:complexType>
             <xsd:attribute name="id" type="xsd:string" use="required" />
-            <xsd:attribute name="column" type="xsd:string" />
+            <xsd:attribute name="column" type="xsd:string" use="required" />
             <xsd:attribute name="algorithm-ref" type="xsd:string" />
         </xsd:complexType>
     </xsd:element>
-- 
GitLab