manticore 0.9.0-java → 0.9.1-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +4 -0
  3. data/CHANGELOG.md +5 -0
  4. data/lib/manticore/client.rb +9 -4
  5. data/lib/manticore/version.rb +1 -1
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 281400646207bd8e4b34bed53610787e5b5d222c72fe5e82dd1d42d8f071f1be
4
- data.tar.gz: 421a4a8f1c4f8e06a7d12377812da2613877877904c73d3d8375348fbb9e2103
3
+ metadata.gz: 381fa920f4a6ca174342719444ebdf44d3f1b23694840cbe942e2806094656b4
4
+ data.tar.gz: cb27a429bd009ab358c28beb8e77143fccb384076f1a03fcfd325e9d8055576b
5
5
  SHA512:
6
- metadata.gz: c72e625dc8aa526a1336c239ced7d46cebf9b16817f9c309b1caaa80028a14e959cbe342e745db69dfef8fd284b1413085a518322406ecab3e7a28725815a34f
7
- data.tar.gz: 37774c46167abf4c8cb637580dc2cf91afc4311b8a284c17d48441ba00824ba0af41e47121780837caffef60632aa3c26bb075b323011a2fcb56fb055495e83c
6
+ metadata.gz: dc3b33be3c5fe29ba240859cfd25455a3d30b45285414773426e9780e5eab016ca7373fdb2d7fed368af00781e502650a1c75b03f577ca316206ef8c1abc1bd3
7
+ data.tar.gz: f983c8e4b6cf27bb91909d0cd83227d684498ac4a6ca72d3249a54cc43a4e5a5051069ba32ee40d7bc9028792fb07b70472907b7214cd4a2ab6a858e4d648bd8
data/.travis.yml CHANGED
@@ -12,6 +12,10 @@ matrix:
12
12
  jdk: openjdk11
13
13
  - rvm: jruby-9.3.4.0 # Ruby 2.6
14
14
  jdk: openjdk11
15
+ - rvm: jruby-9.3.4.0
16
+ jdk: openjdk11
17
+ env:
18
+ - JRUBY_OPTS="-Xcompile.invokedynamic -Xjit.threshold=0"
15
19
  - rvm: jruby-9.2.20.0 # Ruby 2.5
16
20
  jdk: oraclejdk8
17
21
  - rvm: jruby-9.2.20.0
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ### v0.9.1
2
+
3
+ * [fix] work-around JRuby 9.3.4 compatibility
4
+ * [refactor] delay closing async request queue on client.close
5
+
1
6
  ### v0.9.0
2
7
 
3
8
  * [feat] revamped client.close to release resources (#108)
data/lib/manticore/client.rb CHANGED
@@ -69,7 +69,6 @@ module Manticore
69
69
  include_package "org.apache.http.client.config"
70
70
  include_package "org.apache.http.config"
71
71
  include_package "org.apache.http.conn.socket"
72
- include_package "org.apache.http.impl.client"
73
72
  include_package "org.apache.http.impl.conn"
74
73
  include_package "org.apache.http.entity"
75
74
  include_package "org.apache.http.message"
@@ -93,7 +92,12 @@ module Manticore
93
92
  java_import "org.apache.http.conn.ssl.TrustSelfSignedStrategy"
94
93
  java_import "org.apache.http.client.utils.URIBuilder"
95
94
  java_import "org.apache.http.impl.DefaultConnectionReuseStrategy"
95
+ java_import "org.apache.http.impl.NoConnectionReuseStrategy"
96
96
  java_import "org.apache.http.impl.auth.BasicScheme"
97
+ java_import "org.apache.http.impl.client.BasicAuthCache"
98
+ java_import "org.apache.http.impl.client.BasicCookieStore"
99
+ java_import "org.apache.http.impl.client.BasicCredentialsProvider"
100
+ java_import "org.apache.http.impl.client.HttpClientBuilder"
97
101
  java_import "org.apache.http.ssl.SSLContextBuilder"
98
102
  java_import "org.apache.http.ssl.TrustStrategy"
99
103
 
@@ -214,7 +218,7 @@ module Manticore
214
218
 
215
219
  @keepalive = options.fetch(:keepalive, true)
216
220
  if @keepalive == false
217
- builder.set_connection_reuse_strategy { |response, context| false }
221
+ builder.set_connection_reuse_strategy NoConnectionReuseStrategy::INSTANCE # return false
218
222
  else
219
223
  builder.set_connection_reuse_strategy DefaultConnectionReuseStrategy.new
220
224
  end
@@ -373,7 +377,6 @@ module Manticore
373
377
  # @executor&.shutdown rescue nil
374
378
  # @client&.close
375
379
  # @pool&.shutdown rescue nil
376
- @async_requests.close
377
380
  case await
378
381
  when false, nil
379
382
  @executor&.shutdown_now rescue nil
@@ -384,6 +387,7 @@ module Manticore
384
387
  else
385
388
  nil
386
389
  end
390
+ @async_requests.close
387
391
  end
388
392
 
389
393
  # @private
@@ -780,10 +784,11 @@ module Manticore
780
784
  end
781
785
  end
782
786
 
783
- class LoggingStandardRetryHandler < Java::OrgApacheHttpImplClient::StandardHttpRequestRetryHandler
787
+ class LoggingStandardRetryHandler < org.apache.http.impl.client.StandardHttpRequestRetryHandler
784
788
  def retryRequest(exception, executionCount, context)
785
789
  context.setAttribute "retryCount", executionCount
786
790
  super(exception, executionCount, context)
787
791
  end
788
792
  end
793
+ private_constant :LoggingStandardRetryHandler
789
794
  end
data/lib/manticore/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Manticore
2
- VERSION = "0.9.0"
2
+ VERSION = "0.9.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: manticore
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: java
6
6
  authors:
7
7
  - Chris Heald
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-02 00:00:00.000000000 Z
11
+ date: 2022-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ requirements:
110
110
  - jar commons-logging:commons-logging, '~> 1.2'
111
111
  - jar commons-codec:commons-codec, '~> 1.9'
112
112
  - jar org.apache.httpcomponents:httpcore, '~> 4.4.14'
113
- rubygems_version: 3.2.29
113
+ rubygems_version: 3.1.6
114
114
  signing_key:
115
115
  specification_version: 4
116
116
  summary: Manticore is an HTTP client built on the Apache HttpCore components