manticore 0.9.0-java → 0.9.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 281400646207bd8e4b34bed53610787e5b5d222c72fe5e82dd1d42d8f071f1be
-  data.tar.gz: 421a4a8f1c4f8e06a7d12377812da2613877877904c73d3d8375348fbb9e2103
+  metadata.gz: 381fa920f4a6ca174342719444ebdf44d3f1b23694840cbe942e2806094656b4
+  data.tar.gz: cb27a429bd009ab358c28beb8e77143fccb384076f1a03fcfd325e9d8055576b
 SHA512:
-  metadata.gz: c72e625dc8aa526a1336c239ced7d46cebf9b16817f9c309b1caaa80028a14e959cbe342e745db69dfef8fd284b1413085a518322406ecab3e7a28725815a34f
-  data.tar.gz: 37774c46167abf4c8cb637580dc2cf91afc4311b8a284c17d48441ba00824ba0af41e47121780837caffef60632aa3c26bb075b323011a2fcb56fb055495e83c
+  metadata.gz: dc3b33be3c5fe29ba240859cfd25455a3d30b45285414773426e9780e5eab016ca7373fdb2d7fed368af00781e502650a1c75b03f577ca316206ef8c1abc1bd3
+  data.tar.gz: f983c8e4b6cf27bb91909d0cd83227d684498ac4a6ca72d3249a54cc43a4e5a5051069ba32ee40d7bc9028792fb07b70472907b7214cd4a2ab6a858e4d648bd8

data/.travis.yml

@@ -12,6 +12,10 @@ matrix:
       jdk: openjdk11
     - rvm: jruby-9.3.4.0 # Ruby 2.6
       jdk: openjdk11
+    - rvm: jruby-9.3.4.0
+      jdk: openjdk11
+      env:
+        - JRUBY_OPTS="-Xcompile.invokedynamic -Xjit.threshold=0"
     - rvm: jruby-9.2.20.0 # Ruby 2.5
       jdk: oraclejdk8
     - rvm: jruby-9.2.20.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### v0.9.1
+
+* [fix] work-around JRuby 9.3.4 compatibility
+* [refactor] delay closing async request queue on client.close
+
 ### v0.9.0
 
 * [feat] revamped client.close to release resources (#108)

data/lib/manticore/client.rb

@@ -69,7 +69,6 @@ module Manticore
     include_package "org.apache.http.client.config"
     include_package "org.apache.http.config"
     include_package "org.apache.http.conn.socket"
-    include_package "org.apache.http.impl.client"
     include_package "org.apache.http.impl.conn"
     include_package "org.apache.http.entity"
     include_package "org.apache.http.message"
@@ -93,7 +92,12 @@ module Manticore
     java_import "org.apache.http.conn.ssl.TrustSelfSignedStrategy"
     java_import "org.apache.http.client.utils.URIBuilder"
     java_import "org.apache.http.impl.DefaultConnectionReuseStrategy"
+    java_import "org.apache.http.impl.NoConnectionReuseStrategy"
     java_import "org.apache.http.impl.auth.BasicScheme"
+    java_import "org.apache.http.impl.client.BasicAuthCache"
+    java_import "org.apache.http.impl.client.BasicCookieStore"
+    java_import "org.apache.http.impl.client.BasicCredentialsProvider"
+    java_import "org.apache.http.impl.client.HttpClientBuilder"
     java_import "org.apache.http.ssl.SSLContextBuilder"
     java_import "org.apache.http.ssl.TrustStrategy"
 
@@ -214,7 +218,7 @@ module Manticore
 
       @keepalive = options.fetch(:keepalive, true)
       if @keepalive == false
-        builder.set_connection_reuse_strategy { |response, context| false }
+        builder.set_connection_reuse_strategy NoConnectionReuseStrategy::INSTANCE # return false
       else
         builder.set_connection_reuse_strategy DefaultConnectionReuseStrategy.new
       end
@@ -373,7 +377,6 @@ module Manticore
       # @executor&.shutdown rescue nil
       # @client&.close
       # @pool&.shutdown rescue nil
-      @async_requests.close
       case await
       when false, nil
         @executor&.shutdown_now rescue nil
@@ -384,6 +387,7 @@ module Manticore
       else
         nil
       end
+      @async_requests.close
     end
 
     # @private
@@ -780,10 +784,11 @@ module Manticore
     end
   end
 
-  class LoggingStandardRetryHandler < Java::OrgApacheHttpImplClient::StandardHttpRequestRetryHandler
+  class LoggingStandardRetryHandler < org.apache.http.impl.client.StandardHttpRequestRetryHandler
     def retryRequest(exception, executionCount, context)
       context.setAttribute "retryCount", executionCount
       super(exception, executionCount, context)
     end
   end
+  private_constant :LoggingStandardRetryHandler
 end

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ requirements:
 - jar commons-logging:commons-logging,      '~> 1.2'
 - jar commons-codec:commons-codec,          '~> 1.9'
 - jar org.apache.httpcomponents:httpcore,   '~> 4.4.14'
-rubygems_version: 3.2.29
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components