Expression Library priority changed.

README.ja.md

@@ -26,9 +26,9 @@ uroboroSQLは主にSQL中心の設計コンセプトを採用しています。J
     <version>1.0.0-SNAPSHOT</version>
 </dependency>
 <dependency>
-    <groupId>ognl</groupId>
-    <artifactId>ognl</artifactId>
-    <version>3.1.23</version>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-expression</artifactId>
+    <version>5.3.20</version>
 </dependency>
 ```
 
@@ -41,24 +41,24 @@ uroboroSQLは主にSQL中心の設計コンセプトを採用しています。J
     <version>1.0.0-SNAPSHOT</version>
 </dependency>
 <dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>spring-expression</artifactId>
-    <version>5.3.20</version>
+    <groupId>ognl</groupId>
+    <artifactId>ognl</artifactId>
+    <version>3.1.23</version>
 </dependency>
 ```
 
 ### for Gradle
 
 ```gradle
 compile group: 'jp.co.future', name: 'uroborosql', version: '1.0.0-SNAPSHOT'
-compile group: 'ognl', name: 'ognl', version: '3.1.23'
+compile group: 'org.springframework', name: 'spring-expression', version: '5.3.20'
 ```
 
 または
 
 ```gradle
 compile group: 'jp.co.future', name: 'uroborosql', version: '1.0.0-SNAPSHOT'
-compile group: 'org.springframework', name: 'spring-expression', version: '5.3.20'
+compile group: 'ognl', name: 'ognl', version: '3.1.23'
 ```
 
 ## Documentation
@@ -67,7 +67,7 @@ compile group: 'org.springframework', name: 'spring-expression', version: '5.3.2
 
 ## Requirement
 
-- Java 1.8 or later.
+- Java 11 or later.
 
 ## Quick start
 
@@ -109,29 +109,33 @@ INTO
 ```
 
 ```java
-SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "").build();
+SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "")
+    .build();
 
 try (SqlAgent agent = config.agent()) {
   // SELECT
-  List<Map<String, Object>> departments = agent.query("department/select_department").param("dept_no", 1001).collect();
+  List<Map<String, Object>> departments = agent.query("department/select_department")
+      .param("dept_no", 1001)
+      .collect();
 
   // INSERT
   int count = agent.update("department/insert_department")
-    .param("dept_no", 1001)
-    .param("dept_name", "sales")
-    .count();
+      .param("dept_no", 1001)
+      .param("dept_name", "sales")
+      .count();
 }
 ```
 
 ### DAO Interface
 
 ```java
-SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "").build();
+SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "")
+    .build();
 
 try (SqlAgent agent = config.agent()) {
   // select
-  Department dept =
-      agent.find(Department.class, 1001).orElse(null);
+  Department dept = agent.find(Department.class, 1001)
+      .orElse(null);
 
   // insert
   Department hrDept = new Department();
@@ -168,12 +172,14 @@ try (SqlAgent agent = config.agent()) {
 
 - CLI
   - <https://github.com/future-architect/uroboroSQL-formatter>
+- VSCode Plugin
+  - <https://github.com/future-architect/vscode-uroborosql-fmt>
+- Eclipse Plugin
+  - <https://github.com/future-architect/eclipse-uroborosql-formatter>
 - Sublime Text 3 Plugin
   - <https://github.com/future-architect/Sublime-uroboroSQL-formatter>
 - IntelliJ IDEA Platform Plugin
   - <https://github.com/future-architect/idea-uroborosql-formatter>
-- Eclipse Plugin
-  - <https://github.com/future-architect/eclipse-uroborosql-formatter>
 
 ## License
 

README.md

@@ -28,9 +28,9 @@ for Japanese, see [README.ja.md](https://github.com/future-architect/uroborosql/
     <version>1.0.0-SNAPSHOT</version>
 </dependency>
 <dependency>
-    <groupId>ognl</groupId>
-    <artifactId>ognl</artifactId>
-    <version>3.1.23</version>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-expression</artifactId>
+    <version>5.3.20</version>
 </dependency>
 ```
 
@@ -43,24 +43,24 @@ or
     <version>1.0.0-SNAPSHOT</version>
 </dependency>
 <dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>spring-expression</artifactId>
-    <version>5.3.20</version>
+    <groupId>ognl</groupId>
+    <artifactId>ognl</artifactId>
+    <version>3.1.23</version>
 </dependency>
 ```
 
 ### for Gradle
 
 ```gradle
 compile group: 'jp.co.future', name: 'uroborosql', version: '1.0.0-SNAPSHOT'
-compile group: 'ognl', name: 'ognl', version: '3.1.23'
+compile group: 'org.springframework', name: 'spring-expression', version: '5.3.20'
 ```
 
 or
 
 ```gradle
 compile group: 'jp.co.future', name: 'uroborosql', version: '1.0.0-SNAPSHOT'
-compile group: 'org.springframework', name: 'spring-expression', version: '5.3.20'
+compile group: 'ognl', name: 'ognl', version: '3.1.23'
 ```
 
 ## Documentation
@@ -69,7 +69,7 @@ compile group: 'org.springframework', name: 'spring-expression', version: '5.3.2
 
 ## Requirement
 
-- Java 1.8 or later.
+- Java 11 or later.
 
 ## Quick start
 
@@ -111,29 +111,33 @@ INTO
 ```
 
 ```java
-SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "").build();
+SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "")
+    .build();
 
 try (SqlAgent agent = config.agent()) {
   // SELECT
-  List<Map<String, Object>> departments = agent.query("department/select_department").param("dept_no", 1001).collect();
+  List<Map<String, Object>> departments = agent.query("department/select_department")
+      .param("dept_no", 1001)
+      .collect();
 
   // INSERT
   int count = agent.update("department/insert_department")
-    .param("dept_no", 1001)
-    .param("dept_name", "sales")
-    .count();
+      .param("dept_no", 1001)
+      .param("dept_name", "sales")
+      .count();
 }
 ```
 
 ### DAO Interface
 
 ```java
-SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "").build();
+SqlConfig config = UroboroSQL.builder("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1", "sa", "")
+    .build();
 
 try (SqlAgent agent = config.agent()) {
   // select
-  Department dept =
-      agent.find(Department.class, 1001).orElse(null);
+  Department dept = agent.find(Department.class, 1001)
+      .orElse(null);
 
   // insert
   Department hrDept = new Department();
@@ -170,12 +174,14 @@ We also prepare a SQL formatter useful for development.
 
 - CLI
   - <https://github.com/future-architect/uroboroSQL-formatter>
+- VSCode Plugin
+  - <https://github.com/future-architect/vscode-uroborosql-fmt>
+- Eclipse Plugin
+  - <https://github.com/future-architect/eclipse-uroborosql-formatter>
 - Sublime Text 3 Plugin
   - <https://github.com/future-architect/Sublime-uroboroSQL-formatter>
 - IntelliJ IDEA Platform Plugin
   - <https://github.com/future-architect/idea-uroborosql-formatter>
-- Eclipse Plugin
-  - <https://github.com/future-architect/eclipse-uroborosql-formatter>
 
 ## License
 

src/main/java/jp/co/future/uroborosql/store/SqlResourceManagerImpl.java

@@ -383,6 +383,7 @@ public Path getSqlPath(final String sqlName) {
 	 *
 	 * @param path リソースのパス
 	 * @return リソースのURL. リソースが存在しない場合は<code>null</code>
+	 * @throws IOException リソースの取得に失敗した場合
 	 */
 	protected URL getResource(final Path path) throws IOException {
 		var resources = Collections.list(classLoader.getResources(path.toString().replace('\\', '/')));

src/main/resources/META-INF/services/jp.co.future.uroborosql.expr.ExpressionParserFactory

@@ -1,2 +1,2 @@
-jp.co.future.uroborosql.expr.ognl.OgnlExpressionParserFactory
-jp.co.future.uroborosql.expr.spel.SpelExpressionParserFactory
+jp.co.future.uroborosql.expr.spel.SpelExpressionParserFactory
+jp.co.future.uroborosql.expr.ognl.OgnlExpressionParserFactory