Merge remote-tracking branch 'origin/master'

Author: caoli5288

pom.xml

@@ -86,6 +86,26 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.mongodb:mongo-java-driver</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <resources>
             <resource>

src/main/java/com/mengcraft/simpleorm/EbeanHandler.java

@@ -214,7 +214,7 @@ public void initialize() throws DatabaseException {
         if (!(server == null)) {
             throw new DatabaseException("Already initialized!");
         }
-        if (mapping.size() < 1) {
+        if (mapping.isEmpty()) {
             throw new DatabaseException("Not define entity class!");
         }
 
@@ -384,7 +384,8 @@ public void shutdown() throws DatabaseException {
             val i = clz.getDeclaredConstructor(DefaultServer.class);
             i.setAccessible(true);
             ((Runnable) i.newInstance(server)).run();
-            if (dataSource instanceof HikariDataSource && !((HikariDataSource) dataSource).getPoolName().equals("simple_shared")) {// Never shutdown shared
+            if (dataSource instanceof HikariDataSource &&
+                    ((HikariDataSource) dataSource).getPoolName().equals(name)) {// Never shutdown shared
                 ((HikariDataSource) dataSource).close();
             }
             if (managed) {

src/main/java/com/mengcraft/simpleorm/MongoWrapper.java

@@ -64,7 +64,7 @@ public void ping() throws MongoTimeoutException {
     }
 
     public MongoDatabaseWrapper open(String database, String collection) {
-        return open(database, collection, MongoCodecs.BSON);
+        return open(database, collection, MongoCodecs.LEGACY);
     }
 
     public MongoDatabaseWrapper open(String database, String collection, IMongoCodec serializer) {

src/main/java/com/mengcraft/simpleorm/RedisWrapper.java

@@ -70,6 +70,7 @@ public <T> T eval(int database, String scriptName, String... args) {
     @Override
     @SneakyThrows
     public void close() {
+        unsubscribeAll();
         resources.close();
     }
 

src/main/java/com/mengcraft/simpleorm/mongo/BsonMongoCodec.java

@@ -3,5 +3,4 @@
 public class MongoCodecs {
 
     public static final IMongoCodec LEGACY = new LegacyMongoCodec();
-    public static final IMongoCodec BSON = new BsonMongoCodec();
 }