opt

README.md

@@ -8,7 +8,7 @@
 
    [WIKI](https://github.com/x-ream/sqli/wiki)
 
-    sqli/sqli-api
+    sqli/sqli-builder
     sqli/sqli-core
     sqli/sqli-dialect
     sqli/sqli-repo

pom.xml

@@ -11,11 +11,10 @@
 	<description>http://sqli.xream.io</description>
 	<url>http://sqli.xream.io</url>
 	<modules>
+		<module>sqli-builder</module>
 		<module>sqli-core</module>
-		<module>sqli-dialect</module>
 		<module>sqli-repo</module>
-		<module>sqli-builder</module>
-		<module>sqli-api</module>
+		<module>sqli-dialect</module>
 	</modules>
 
 	<properties>

sqli-api/pom.xml → sqli-builder/pom.xml

@@ -9,15 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sqli-api</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.xream.sqli</groupId>
-            <artifactId>sqli-core</artifactId>
-            <version>${sqli.version}</version>
-        </dependency>
-    </dependencies>
+    <artifactId>sqli-builder</artifactId>
 
 
 </project>

sqli-core/src/main/java/io/xream/sqli/builder/Criteria.java → sqli-builder/src/main/java/io/xream/sqli/builder/Criteria.java

@@ -19,7 +19,7 @@
 package io.xream.sqli.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.xream.sqli.api.Routable;
+import io.xream.sqli.core.Routable;
 import io.xream.sqli.core.Mappable;
 import io.xream.sqli.core.PropertyMapping;
 import io.xream.sqli.core.ResultMapHelpful;

sqli-core/src/main/java/io/xream/sqli/builder/InCondition.java → sqli-builder/src/main/java/io/xream/sqli/builder/InCondition.java

@@ -19,7 +19,7 @@
 package io.xream.sqli.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.xream.sqli.api.Routable;
+import io.xream.sqli.core.Routable;
 
 import java.util.List;
 

sqli-core/src/main/java/io/xream/sqli/builder/RefreshCondition.java → sqli-builder/src/main/java/io/xream/sqli/builder/RefreshCondition.java

@@ -20,7 +20,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.xream.sqli.annotation.X;
-import io.xream.sqli.api.Routable;
+import io.xream.sqli.core.Routable;
 import io.xream.sqli.core.Mappable;
 import io.xream.sqli.parser.Parsed;
 import io.xream.sqli.parser.Parser;

sqli-core/src/main/java/io/xream/sqli/builder/RemoveRefreshCreate.java → sqli-builder/src/main/java/io/xream/sqli/builder/RemoveRefreshCreate.java

@@ -19,7 +19,7 @@
 package io.xream.sqli.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.xream.sqli.api.Routable;
+import io.xream.sqli.core.Routable;
 
 import java.util.List;
 

sqli-core/src/main/java/io/xream/sqli/core/PropertyMapping.java → sqli-builder/src/main/java/io/xream/sqli/core/PropertyMapping.java

@@ -26,17 +26,17 @@
  * @Author Sim
  */
 public final class PropertyMapping {
-    private Map<String, String> propertyMappingMap = new HashMap<String, String>();
+//    private Map<String, String> propertyMappingMap = new HashMap<String, String>();
     private Map<String, String> columnPropertyMap = new HashMap<String, String>();
 
     public void put(String property, String mapper) {
-        this.propertyMappingMap.put(property, mapper);
+//        this.propertyMappingMap.put(property, mapper);
         this.columnPropertyMap.put(mapper, property);
     }
 
-    public String mapper(String property) {
-        return this.propertyMappingMap.get(property);
-    }
+//    public String mapper(String property) {
+//        return this.propertyMappingMap.get(property);
+//    }
 
     public String property(String mapper) {
         String property = this.columnPropertyMap.get(mapper);
@@ -45,9 +45,4 @@ public String property(String mapper) {
         return property;
     }
 
-    @Override
-    public String toString() {
-        return "PropertyMapping [propertyMappingMap=" + propertyMappingMap + ", columnPropertyMap=" + columnPropertyMap
-                + "]";
-    }
 }

sqli-core/src/main/java/io/xream/sqli/api/Routable.java → sqli-builder/src/main/java/io/xream/sqli/core/Routable.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.api;
+package io.xream.sqli.core;
 
 /**
  * to find target unit,

sqli-core/pom.xml

@@ -11,4 +11,13 @@
 
     <artifactId>sqli-core</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>io.xream.sqli</groupId>
+            <artifactId>sqli-builder</artifactId>
+            <version>${sqli.version}</version>
+        </dependency>
+    </dependencies>
+
+
 </project>

sqli-api/src/main/java/io/xream/sqli/api/BaseRepository.java → sqli-core/src/main/java/io/xream/sqli/api/BaseRepository.java

@@ -21,8 +21,8 @@
 import io.xream.sqli.builder.Criteria;
 import io.xream.sqli.builder.RefreshCondition;
 import io.xream.sqli.builder.RemoveRefreshCreate;
-import io.xream.sqli.internal.RowHandler;
-import io.xream.sqli.internal.Typed;
+import io.xream.sqli.core.RowHandler;
+import io.xream.sqli.core.Typed;
 import io.xream.sqli.page.Page;
 
 import java.util.List;

sqli-api/src/main/java/io/xream/sqli/api/NativeRepository.java → sqli-core/src/main/java/io/xream/sqli/api/NativeRepository.java

@@ -18,6 +18,8 @@
  */
 package io.xream.sqli.api;
 
+import io.xream.sqli.core.NativeSupport;
+
 /**
  * @Author Sim
  */

sqli-api/src/main/java/io/xream/sqli/api/ResultMapRepository.java → sqli-core/src/main/java/io/xream/sqli/api/ResultMapRepository.java

@@ -19,7 +19,7 @@
 package io.xream.sqli.api;
 
 import io.xream.sqli.builder.Criteria;
-import io.xream.sqli.internal.RowHandler;
+import io.xream.sqli.core.RowHandler;
 import io.xream.sqli.page.Page;
 
 import java.util.List;

sqli-api/src/main/java/io/xream/sqli/converter/DataObjectConverter.java → sqli-core/src/main/java/io/xream/sqli/converter/DataObjectConverter.java

@@ -21,7 +21,7 @@
 import io.xream.sqli.core.ResultMapHelpful;
 import io.xream.sqli.core.SqlScript;
 import io.xream.sqli.exception.PersistenceException;
-import io.xream.sqli.internal.Dialect;
+import io.xream.sqli.core.Dialect;
 import io.xream.sqli.parser.BeanElement;
 import io.xream.sqli.parser.Parsed;
 import io.xream.sqli.parser.Parser;

sqli-api/src/main/java/io/xream/sqli/converter/ObjectDataConverter.java → sqli-core/src/main/java/io/xream/sqli/converter/ObjectDataConverter.java

@@ -20,7 +20,7 @@
 
 import io.xream.sqli.exception.ParsingException;
 import io.xream.sqli.exception.PersistenceException;
-import io.xream.sqli.internal.Dialect;
+import io.xream.sqli.core.Dialect;
 import io.xream.sqli.parser.BeanElement;
 import io.xream.sqli.parser.Parsed;
 import io.xream.sqli.util.BeanUtil;

sqli-api/src/main/java/io/xream/sqli/internal/BaseFinder.java → sqli-core/src/main/java/io/xream/sqli/core/BaseFinder.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 import io.xream.sqli.converter.DataObjectConverter;
 import io.xream.sqli.parser.BeanElement;

sqli-api/src/main/java/io/xream/sqli/internal/Dialect.java → sqli-core/src/main/java/io/xream/sqli/core/Dialect.java

@@ -16,10 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 
-import io.xream.sqli.core.ValuePost;
 import io.xream.sqli.parser.BeanElement;
 
 import java.util.Collection;

sqli-api/src/main/java/io/xream/sqli/internal/IdGenerator.java → sqli-core/src/main/java/io/xream/sqli/core/IdGenerator.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 /**
  * @Author Sim

sqli-api/src/main/java/io/xream/sqli/internal/JdbcWrapper.java → sqli-core/src/main/java/io/xream/sqli/core/JdbcWrapper.java

@@ -16,9 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
-
-import io.xream.sqli.core.Parseable;
+package io.xream.sqli.core;
 
 import java.util.Collection;
 import java.util.List;

sqli-api/src/main/java/io/xream/sqli/internal/KeyOne.java → sqli-core/src/main/java/io/xream/sqli/core/KeyOne.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 /**
  * @Author Sim

sqli-api/src/main/java/io/xream/sqli/api/NativeSupport.java → sqli-core/src/main/java/io/xream/sqli/core/NativeSupport.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.api;
+package io.xream.sqli.core;
 
 import java.util.List;
 import java.util.Map;

sqli-api/src/main/java/io/xream/sqli/internal/Repository.java → sqli-core/src/main/java/io/xream/sqli/core/Repository.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 import io.xream.sqli.builder.Criteria;
 import io.xream.sqli.builder.RefreshCondition;

sqli-api/src/main/java/io/xream/sqli/internal/RepositoryManagement.java → sqli-core/src/main/java/io/xream/sqli/core/RepositoryManagement.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 import io.xream.sqli.api.BaseRepository;
 

sqli-api/src/main/java/io/xream/sqli/internal/ResultMapFinder.java → sqli-core/src/main/java/io/xream/sqli/core/ResultMapFinder.java

@@ -16,10 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 import io.xream.sqli.converter.DataObjectConverter;
-import io.xream.sqli.core.ResultMapHelpful;
 import io.xream.sqli.parser.Parsed;
 import io.xream.sqli.util.JsonStyleMapUtil;
 

sqli-api/src/main/java/io/xream/sqli/internal/RowHandler.java → sqli-core/src/main/java/io/xream/sqli/core/RowHandler.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 /**
  * @Author Sim

sqli-api/src/main/java/io/xream/sqli/internal/Typed.java → sqli-core/src/main/java/io/xream/sqli/core/Typed.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.internal;
+package io.xream.sqli.core;
 
 /**
  * @Author Sim

sqli-dialect/pom.xml

@@ -14,7 +14,7 @@
 
         <dependency>
             <groupId>io.xream.sqli</groupId>
-            <artifactId>sqli-api</artifactId>
+            <artifactId>sqli-core</artifactId>
             <version>${sqli.version}</version>
         </dependency>
 

sqli-dialect/src/main/java/io/xream/sqli/dialect/MySqlDialect.java

@@ -19,7 +19,7 @@
 package io.xream.sqli.dialect;
 
 import io.xream.sqli.core.SqlScript;
-import io.xream.sqli.internal.Dialect;
+import io.xream.sqli.core.Dialect;
 import io.xream.sqli.parser.BeanElement;
 import io.xream.sqli.util.BeanUtil;
 import io.xream.sqli.util.JsonWrapper;

sqli-dialect/src/main/java/io/xream/sqli/dialect/OracleDialect.java

@@ -20,7 +20,7 @@
 
 import io.xream.sqli.exception.NotSupportedException;
 import io.xream.sqli.exception.PersistenceException;
-import io.xream.sqli.internal.Dialect;
+import io.xream.sqli.core.Dialect;
 import io.xream.sqli.parser.BeanElement;
 import io.xream.sqli.util.BeanUtil;
 import io.xream.sqli.util.JsonWrapper;

sqli-repo/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>io.xream.sqli</groupId>
-            <artifactId>sqli-api</artifactId>
+            <artifactId>sqli-builder</artifactId>
             <version>${sqli.version}</version>
         </dependency>
         <dependency>

sqli-repo/src/main/java/io/xream/sqli/repository/core/CacheableRepository.java → sqli-repo/src/main/java/io/xream/sqli/core/core/CacheableRepository.java

@@ -16,23 +16,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.repository.core;
+package io.xream.sqli.core.core;
 
 
-import io.xream.sqli.api.NativeSupport;
+import io.xream.sqli.core.NativeSupport;
 import io.xream.sqli.builder.Criteria;
 import io.xream.sqli.builder.InCondition;
 import io.xream.sqli.builder.KV;
 import io.xream.sqli.builder.RefreshCondition;
 import io.xream.sqli.cache.L2CacheResolver;
 import io.xream.sqli.exception.QueryException;
-import io.xream.sqli.internal.KeyOne;
-import io.xream.sqli.internal.Repository;
-import io.xream.sqli.internal.RowHandler;
+import io.xream.sqli.core.KeyOne;
+import io.xream.sqli.core.Repository;
+import io.xream.sqli.core.RowHandler;
 import io.xream.sqli.page.Page;
 import io.xream.sqli.parser.Parsed;
 import io.xream.sqli.parser.Parser;
-import io.xream.sqli.repository.dao.Dao;
+import io.xream.sqli.core.dao.Dao;
 import io.xream.sqli.util.ParserUtil;
 import io.xream.sqli.util.SqliExceptionUtil;
 import io.xream.sqli.util.SqliLoggerProxy;

sqli-repo/src/main/java/io/xream/sqli/repository/core/CreateOrReplaceOptimization.java → sqli-repo/src/main/java/io/xream/sqli/core/core/CreateOrReplaceOptimization.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.repository.core;
+package io.xream.sqli.core.core;
 
 import io.xream.sqli.parser.Parsed;
 import io.xream.sqli.util.ParserUtil;

sqli-repo/src/main/java/io/xream/sqli/repository/core/InOptimization.java → sqli-repo/src/main/java/io/xream/sqli/core/core/InOptimization.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.repository.core;
+package io.xream.sqli.core.core;
 
 import io.xream.sqli.builder.InCondition;
 import io.xream.sqli.filter.BaseTypeFilter;

sqli-repo/src/main/java/io/xream/sqli/repository/dao/Dao.java → sqli-repo/src/main/java/io/xream/sqli/core/dao/Dao.java

@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.xream.sqli.repository.dao;
+package io.xream.sqli.core.dao;
 
 import io.xream.sqli.builder.Criteria;
 import io.xream.sqli.builder.InCondition;
 import io.xream.sqli.builder.RefreshCondition;
 import io.xream.sqli.cache.QueryForCache;
-import io.xream.sqli.internal.KeyOne;
-import io.xream.sqli.internal.RowHandler;
+import io.xream.sqli.core.KeyOne;
+import io.xream.sqli.core.RowHandler;
 import io.xream.sqli.page.Page;
 
 import java.util.List;