升级并加入derby

.gitignore

@@ -5,4 +5,5 @@
 /.project
 /.idea
 /*.iml
-/.DS_Store
+/.DS_Store
+/derby.log

pom.xml

@@ -15,6 +15,7 @@
     	<spring.version>3.2.4.RELEASE</spring.version>
     	<mybatis.version>3.2.2</mybatis.version>
 		<mybatis-spring.version>1.2.1</mybatis-spring.version>
+        <maven.compler.encoding>UTF-8</maven.compler.encoding>
     </properties>
 
 	<dependencies>
@@ -212,7 +213,24 @@
 			<version>1.1</version>
 			<scope>test</scope>
 		</dependency>
-
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <version>10.13.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>1.8.5.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.7</version>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 	<licenses>
@@ -233,6 +251,11 @@
 			<name>Feng Kuok</name>
 			<email>[email protected]</email>
 		</developer>
+        <developer>
+            <id>myc</id>
+            <name>Ma Yichao</name>
+            <email>[email protected]</email>
+        </developer>
 	</developers>
 
 	<mailingLists>
@@ -263,22 +286,25 @@
 			<plugin>
 			    <groupId>org.apache.maven.plugins</groupId>
 			    <artifactId>maven-resources-plugin</artifactId>
-			    <version>2.6</version>
+                <version>3.0.2</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+                <version>3.6.1</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
-					<source>1.6</source>
-					<target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
+                <version>2.19.1</version>
 				<configuration>
 					<skip>false</skip>
 					<testFailureIgnore>true</testFailureIgnore>
@@ -290,21 +316,32 @@
 					<dependency>
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit47</artifactId>
-						<version>2.12.4</version>
+                        <version>2.19.1</version>
 					</dependency>
 				</dependencies>
 			</plugin>
 
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.6</version>
+                <version>2.7</version>
+                <configuration>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
+                    <instrumentation>
+                        <excludes>
+                            <exclude>**/*Test.class</exclude>
+                        </excludes>
+                    </instrumentation>
+                </configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.4</version>
+                <version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -314,6 +351,67 @@
 					</execution>
 				</executions>
 			</plugin>
+             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <nohelp>true</nohelp>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+
+            </plugin>
+            <plugin>  
+                <groupId>org.codehaus.mojo</groupId>  
+                <artifactId>findbugs-maven-plugin</artifactId>  
+                <version>3.0.4</version>  
+                <configuration>  
+                    <!-- <configLocation>${basedir}/springside-findbugs.xml</configLocation> -->  
+
+                    <threshold>High</threshold>  
+                    <effort>Default</effort>  
+                    <findbugsXmlOutput>true</findbugsXmlOutput>  
+                    <!-- findbugs xml���·��-->         
+                    <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>  
+                </configuration>  
+            </plugin>  
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>findbugs-maven-plugin</artifactId>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
 </project>

src/main/java/org/makersoft/shards/ShardedEntity.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 MaYichao.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.makersoft.shards;
+
+import org.makersoft.shards.ShardId;
+
+/**
+ * 分区存储对象.
+ * @author MaYichao
+ */
+public interface ShardedEntity {
+
+    /**
+     * 分区与分表信息.
+     * @return the shardId
+     */
+    ShardId getShardId();
+
+}

src/main/java/org/makersoft/shards/cfg/MyBatisConfigurationsWrapper.java

@@ -8,8 +8,11 @@
  */
 package org.makersoft.shards.cfg;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.apache.ibatis.binding.BindingException;
 import org.apache.ibatis.mapping.Environment;
@@ -25,6 +28,8 @@
  * (只重写用的到的几个方法)
  */
 public class MyBatisConfigurationsWrapper extends Configuration {
+
+    private static final Log log = LogFactory.getLog(MyBatisConfigurationsWrapper.class);
 
 	private final Configuration configuration;
 
@@ -128,12 +133,13 @@ public boolean hasStatement(String statementName, boolean validateIncompleteStat
 	protected void buildAllStatements() {
 		for (SqlSessionFactory sqlSessionFactory : getSqlSessionFactories()) {
 			try {
-				Configuration configuration = sqlSessionFactory.getConfiguration();
+				Configuration conf = sqlSessionFactory.getConfiguration();
 
 				Method m = Configuration.class.getDeclaredMethod("buildAllStatements");
 				m.setAccessible(true);
-				m.invoke(configuration);
-			} catch (Exception e) {
+				m.invoke(conf);
+			} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+                log.error("build statements failed!", e);
 				// ignore exception
 			}
 		}

src/main/java/org/makersoft/shards/id/uuid/ShardedUUIDGenerator.java

@@ -46,6 +46,10 @@ public Serializable generate(SqlSession session, Object object) {
 
 	@Override
 	public ShardId extractShardId(Serializable identifier) {
+        //如果是整型直接定位分区.
+        if (identifier instanceof Integer) {
+            return new ShardId((Integer)identifier);
+        }
 		String hexId = (String) identifier;
 		return new ShardId(Integer.decode("0x" + hexId.substring(0, 4)));
 	}