reduce rejections version and fix contactSearch and messageSearch method in Puppet

Author: redmaple1

pom.xml

@@ -168,6 +168,11 @@
                 <artifactId>javafaker</artifactId>
                 <version>1.0.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.reflections</groupId>
+                <artifactId>reflections</artifactId>
+                <version>0.9.10</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

wechaty-puppet/src/main/kotlin/Puppet.kt

@@ -426,39 +426,39 @@ abstract class Puppet : EventEmitter {
                 return@supplyAsync list
             }
 
-            val stream = list?.stream()?.map { contactPayload(it).get() }
+            var stream = list?.stream()?.map { contactPayload(it).get() }
             if (StringUtils.isNotBlank(query.name)) {
-                stream?.filter {
+                stream = stream?.filter {
                     StringUtils.equals(query.name, it.name)
                 }
             }
 
             if (StringUtils.isNotBlank(query.alias)) {
-                stream?.filter {
+                stream = stream?.filter {
                     StringUtils.equals(query.alias, it.alias)
                 }
             }
 
             if (StringUtils.isNotBlank(query.id)) {
-                stream?.filter {
+                stream = stream?.filter {
                     StringUtils.equals(query.alias, it.alias)
                 }
             }
 
             if (StringUtils.isNotBlank(query.weixin)) {
-                stream?.filter {
+                stream = stream?.filter {
                     StringUtils.equals(query.alias, it.alias)
                 }
             }
 
             if (query.nameReg != null) {
-                stream?.filter {
+                stream = stream?.filter {
                     query.nameReg!!.matches(it.name ?: "")
                 }
             }
 
             if (query.aliasReg != null) {
-                stream?.filter {
+                stream = stream?.filter {
                     query.aliasReg!!.matches(it.alias ?: "")
                 }
             }
@@ -650,46 +650,46 @@ abstract class Puppet : EventEmitter {
                 messagePayload(it).get()
             }
 
-            val stream = messagePayloadList.stream()
+            var stream = messagePayloadList.stream()
 
             if (StringUtils.isNotEmpty(query.fromId)) {
-                stream.filter {
+                stream = stream.filter {
                     StringUtils.equals(it.fromId, query.fromId)
                 }
             }
 
             if (StringUtils.isNotEmpty(query.id)) {
-                stream.filter {
+                stream = stream.filter {
                     StringUtils.equals(it.id, query.id)
                 }
             }
 
             if (StringUtils.isNotEmpty(query.roomId)) {
-                stream.filter {
+                stream = stream.filter {
                     StringUtils.equals(it.roomId, query.roomId)
                 }
             }
 
             if (StringUtils.isNotEmpty(query.toId)) {
-                stream.filter {
+                stream = stream.filter {
                     StringUtils.equals(it.toId, query.toId)
                 }
             }
 
             if (StringUtils.isNotEmpty(query.text)) {
-                stream.filter {
+                stream = stream.filter {
                     StringUtils.equals(it.text, query.text)
                 }
             }
 
             if (query.textReg != null) {
-                stream.filter {
+                stream = stream.filter {
                     query.textReg!!.matches(it.text ?: "")
                 }
             }
 
             if (query.type != null) {
-                stream.filter {
+                stream = stream.filter {
                     query.type == it.type
                 }
             }

wechaty/pom.xml

@@ -110,9 +110,7 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
         </dependency>
-
     </dependencies>
 
     <build>

wechaty/src/main/kotlin/io/github/wechaty/user/manager/PuppetManager.kt

@@ -6,6 +6,7 @@ import io.github.wechaty.schemas.PuppetOptions
 import io.github.wechaty.utils.JsonUtils
 import org.reflections.Reflections
 import org.reflections.util.ClasspathHelper
+import org.reflections.util.ConfigurationBuilder
 import org.slf4j.LoggerFactory
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Future
@@ -21,8 +22,12 @@ class PuppetManager {
         fun resolveInstance(wechatyOptions: WechatyOptions): Future<Puppet> {
             log.info("PuppetManager resolveInstance(${JsonUtils.write(wechatyOptions)})")
 
-            val reflections = Reflections(ClasspathHelper.forPackage(REFLECTION_BASE_PACKAGE, Thread.currentThread().contextClassLoader))
+            val reflections = Reflections(ConfigurationBuilder().setUrls(ClasspathHelper.forPackage(REFLECTION_BASE_PACKAGE, Thread.currentThread().contextClassLoader)))
+
             val subTypes: Set<*> = reflections.getSubTypesOf(Puppet::class.java)
+            if (subTypes.isEmpty()) {
+                throw java.lang.RuntimeException("expect one puppet,but can not found any one.")
+            }
 
             if (subTypes.size > 1) {
                 throw RuntimeException("expect one puppet,but found ${subTypes.size}")