From dcfff16a27819d55a7167a1b82cc2ce483fba6cf Mon Sep 17 00:00:00 2001
From: trydofor <trydofor@gmail.com>
Date: Mon, 25 Dec 2023 17:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=8C=20shardingsphere=20and=20jakarta?=
 =?UTF-8?q?=20EE=20#169?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wings/faceless-shard/pom.xml                          | 11 +++++++++++
 .../bean/FacelessShardingSphereConfiguration.java     |  5 +++--
 .../extra-conf/shardingsphere-standalone.yml          |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/wings/faceless-shard/pom.xml b/wings/faceless-shard/pom.xml
index 2a39c783d..d58778b26 100644
--- a/wings/faceless-shard/pom.xml
+++ b/wings/faceless-shard/pom.xml
@@ -21,6 +21,17 @@
             <groupId>pro.fessional.wings</groupId>
             <artifactId>faceless-awesome</artifactId>
         </dependency>
+        <!--  shardingsphere and jakarta EE #169 -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.33</version>
+        </dependency>
         <!--sharding sphere-->
         <dependency>
             <groupId>org.apache.shardingsphere</groupId>
diff --git a/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java b/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java
index 651ff376e..79ba897ad 100644
--- a/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java
+++ b/wings/faceless-shard/src/main/java/pro/fessional/wings/faceless/spring/bean/FacelessShardingSphereConfiguration.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereDriverURLManager;
+import org.apache.shardingsphere.driver.jdbc.core.driver.ShardingSphereURLManager;
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
 import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
@@ -36,7 +36,8 @@ public DataSourceContext.Customizer shardingDataSourceContext(@Value("${spring.d
             return ignored -> false;
         }
 
-        final byte[] yamlBytes = ShardingSphereDriverURLManager.getContent(jdbcUrl);
+//        final byte[] yamlBytes = ShardingSphereDriverURLManager.getContent(jdbcUrl);
+        final byte[] yamlBytes = ShardingSphereURLManager.getContent(jdbcUrl, "jdbc:shardingsphere:");
         YamlRootConfiguration rootConfig = YamlEngine.unmarshal(yamlBytes, YamlRootConfiguration.class);
         final YamlDataSourceConfigurationSwapper configurationSwapper = new YamlDataSourceConfigurationSwapper();
         final Map<String, DataSource> dsMap = configurationSwapper.swapToDataSources(rootConfig.getDataSources());
diff --git a/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml b/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml
index b4369e10a..169e214e8 100644
--- a/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml
+++ b/wings/faceless-shard/src/test/resources/extra-conf/shardingsphere-standalone.yml
@@ -66,3 +66,6 @@ rules:
         type: INLINE
         props:
           algorithm-expression: tst_sharding_$->{id % 5}
+  - !SINGLE
+    tables:
+      - "*.*"
\ No newline at end of file