From 201fa9a3bc496c7a2115dd5f4c38b784858416d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Mon, 12 Mar 2012 20:48:28 +0800
Subject: [PATCH] refactor

---
 src/main/java/com/alibaba/druid/mapping/MappingEngine.java   | 2 ++
 .../com/alibaba/druid/mapping/{ => spi}/MappingProvider.java | 3 ++-
 .../com/alibaba/druid/mapping/{ => spi}/MappingVisitor.java  | 3 ++-
 .../alibaba/druid/mapping/{ => spi}/MappingVisitorUtils.java | 5 ++++-
 .../druid/mapping/{ => spi}/MySqlMappingProvider.java        | 3 ++-
 .../alibaba/druid/mapping/{ => spi}/MySqlMappingVisitor.java | 3 ++-
 .../druid/mapping/{ => spi}/OracleMappingProvider.java       | 3 ++-
 .../druid/mapping/{ => spi}/OracleMappingVisitor.java        | 3 ++-
 8 files changed, 18 insertions(+), 7 deletions(-)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/MappingProvider.java (81%)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/MappingVisitor.java (81%)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/MappingVisitorUtils.java (94%)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/MySqlMappingProvider.java (95%)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/MySqlMappingVisitor.java (97%)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/OracleMappingProvider.java (91%)
 rename src/main/java/com/alibaba/druid/mapping/{ => spi}/OracleMappingVisitor.java (97%)

diff --git a/src/main/java/com/alibaba/druid/mapping/MappingEngine.java b/src/main/java/com/alibaba/druid/mapping/MappingEngine.java
index 0ae2680710..f142091a8e 100644
--- a/src/main/java/com/alibaba/druid/mapping/MappingEngine.java
+++ b/src/main/java/com/alibaba/druid/mapping/MappingEngine.java
@@ -2,6 +2,8 @@ package com.alibaba.druid.mapping;
 
 import java.util.LinkedHashMap;
 
+import com.alibaba.druid.mapping.spi.MappingProvider;
+import com.alibaba.druid.mapping.spi.MappingVisitor;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
 
diff --git a/src/main/java/com/alibaba/druid/mapping/MappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java
similarity index 81%
rename from src/main/java/com/alibaba/druid/mapping/MappingProvider.java
rename to src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java
index 160fb2164a..8af0a54ca4 100644
--- a/src/main/java/com/alibaba/druid/mapping/MappingProvider.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/MappingProvider.java
@@ -1,5 +1,6 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
+import com.alibaba.druid.mapping.MappingEngine;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
 
diff --git a/src/main/java/com/alibaba/druid/mapping/MappingVisitor.java b/src/main/java/com/alibaba/druid/mapping/spi/MappingVisitor.java
similarity index 81%
rename from src/main/java/com/alibaba/druid/mapping/MappingVisitor.java
rename to src/main/java/com/alibaba/druid/mapping/spi/MappingVisitor.java
index 534b946477..c6621711ac 100644
--- a/src/main/java/com/alibaba/druid/mapping/MappingVisitor.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/MappingVisitor.java
@@ -1,7 +1,8 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
 import java.util.Map;
 
+import com.alibaba.druid.mapping.Entity;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
diff --git a/src/main/java/com/alibaba/druid/mapping/MappingVisitorUtils.java b/src/main/java/com/alibaba/druid/mapping/spi/MappingVisitorUtils.java
similarity index 94%
rename from src/main/java/com/alibaba/druid/mapping/MappingVisitorUtils.java
rename to src/main/java/com/alibaba/druid/mapping/spi/MappingVisitorUtils.java
index 28acc3d4be..12a9a3aa69 100644
--- a/src/main/java/com/alibaba/druid/mapping/MappingVisitorUtils.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/MappingVisitorUtils.java
@@ -1,5 +1,8 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
+import com.alibaba.druid.mapping.DruidMappingException;
+import com.alibaba.druid.mapping.Entity;
+import com.alibaba.druid.mapping.Property;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
diff --git a/src/main/java/com/alibaba/druid/mapping/MySqlMappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java
similarity index 95%
rename from src/main/java/com/alibaba/druid/mapping/MySqlMappingProvider.java
rename to src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java
index 4048e4d550..e1dddc1e9f 100644
--- a/src/main/java/com/alibaba/druid/mapping/MySqlMappingProvider.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingProvider.java
@@ -1,5 +1,6 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
+import com.alibaba.druid.mapping.MappingEngine;
 import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
diff --git a/src/main/java/com/alibaba/druid/mapping/MySqlMappingVisitor.java b/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingVisitor.java
similarity index 97%
rename from src/main/java/com/alibaba/druid/mapping/MySqlMappingVisitor.java
rename to src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingVisitor.java
index 25eacdc031..50d8907e06 100644
--- a/src/main/java/com/alibaba/druid/mapping/MySqlMappingVisitor.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/MySqlMappingVisitor.java
@@ -1,8 +1,9 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.alibaba.druid.mapping.Entity;
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
diff --git a/src/main/java/com/alibaba/druid/mapping/OracleMappingProvider.java b/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java
similarity index 91%
rename from src/main/java/com/alibaba/druid/mapping/OracleMappingProvider.java
rename to src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java
index d4225a84ad..503bdd3f3f 100644
--- a/src/main/java/com/alibaba/druid/mapping/OracleMappingProvider.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingProvider.java
@@ -1,5 +1,6 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
+import com.alibaba.druid.mapping.MappingEngine;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.oracle.parser.OracleSelectParser;
diff --git a/src/main/java/com/alibaba/druid/mapping/OracleMappingVisitor.java b/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingVisitor.java
similarity index 97%
rename from src/main/java/com/alibaba/druid/mapping/OracleMappingVisitor.java
rename to src/main/java/com/alibaba/druid/mapping/spi/OracleMappingVisitor.java
index dd09b3482e..15781bf69f 100644
--- a/src/main/java/com/alibaba/druid/mapping/OracleMappingVisitor.java
+++ b/src/main/java/com/alibaba/druid/mapping/spi/OracleMappingVisitor.java
@@ -1,8 +1,9 @@
-package com.alibaba.druid.mapping;
+package com.alibaba.druid.mapping.spi;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.alibaba.druid.mapping.Entity;
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;