iudex-jetty-httpclient 1.3.0-java → 1.4.0-java

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.4.0 (2013-10-29)
+* Upgrade to rjack-jetty >= 9.0.0.5, < 9.1. This is a major
+  re-implementation throughout, with iudex configuration interface
+  changes. Internal redirects are no longer supported.
+* Upgrade to iudex-* ~> 1.4.0 dependencies
+* Upgrade to minitest ~> 4.7.4 (dev)
+
 === 1.3.0 (2012-11-8)
 * Upgrade to logback ~> 1.5 (dev)
 * Add Client.setCancelOnExpire and default true. This is a seemingly

data/Manifest.txt

@@ -7,4 +7,4 @@ lib/iudex-jetty-httpclient/base.rb
 lib/iudex-jetty-httpclient.rb
 test/setup.rb
 test/test_httpclient.rb
-lib/iudex-jetty-httpclient/iudex-jetty-httpclient-1.3.0.jar
+lib/iudex-jetty-httpclient/iudex-jetty-httpclient-1.4.0.jar

data/README.rdoc

@@ -11,7 +11,7 @@ iudex-http interfaces.
 
 == License
 
-Copyright (c) 2008-2012 David Kellum
+Copyright (c) 2008-2013 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/lib/iudex-jetty-httpclient.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2012 David Kellum
+# Copyright (c) 2008-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -31,41 +31,51 @@ module Iudex
     require "#{LIB_DIR}/iudex-jetty-httpclient-#{VERSION}.jar"
 
     import 'iudex.jettyhttpclient.Client'
+    import 'org.eclipse.jetty.util.HttpCookieStore'
+    import 'org.eclipse.jetty.util.ssl.SslContextFactory'
 
     include RJack::Jetty
 
-    def self.create_jetty_client( opts = {} )
-      cfg = { :timeout                     => 6_000,
-              :so_timeout                  => 5_000,
-              :connect_timeout             => 3_000,
-              :idle_timeout                => 6_000,
-              :max_retries                 => 1,
-              :max_redirects               => 6,
-              :max_connections_per_address => 2,
-              :max_queue_size_per_address  => 100,
-              :connect_blocking            => false,
-              :handle_redirects_internal   => false }
-
-      cfg = cfg.merge( opts )
-      cfg = Hooker.merge( [ :iudex, :jetty_httpclient ], cfg )
+    def self.create_jetty_client( cfg = {} )
 
-      jclient = HttpClient.new
+      ssl_factory = SslContextFactory.new
+      ctx_cfg = cfg.delete( :ssl_context )
+      ctx_cfg.each do |key,value|
+        ssl_factory.__send__( "set_#{key}", value )
+      end
 
-      redir_listen = cfg.delete( :handle_redirects_internal )
+      jclient = HttpClient.new( ssl_factory )
 
       cfg.each do |key,value|
         jclient.__send__( "set_#{key}", value )
       end
 
-      if redir_listen
-        jclient.register_listener( 'org.eclipse.jetty.client.RedirectListener' )
-      end
+      jclient.cookie_store = HttpCookieStore::Empty.new
 
       jclient
     end
 
     def self.create_client( opts = {} )
-      Client.new( create_jetty_client( opts ) )
+      cfg = { :timeout                     => 6_000,
+              :connect_timeout             => 3_000,
+              :idle_timeout                => 6_000,
+              :max_connections_per_destination     => 2,
+              :max_requests_queued_per_destination => 100,
+              :dispatch_io                 => true,
+              :follow_redirects            => false,
+              :max_redirects               => 6,
+              :ssl_context => { :trust_all => true } }
+
+      cfg = cfg.merge( opts )
+      cfg = Hooker.merge( [ :iudex, :jetty_httpclient ], cfg )
+
+      timeout = cfg.delete( :timeout )
+
+      client = Client.new( create_jetty_client( cfg ) )
+
+      client.timeout = timeout if timeout
+
+      client
     end
 
   end

data/lib/iudex-jetty-httpclient/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2012 David Kellum
+# Copyright (c) 2008-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,7 +16,7 @@
 
 module Iudex
   module JettyHTTPClient
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
 
     LIB_DIR = File.dirname( __FILE__ ) # :nodoc:
   end

data/pom.xml

@@ -5,13 +5,13 @@
   <groupId>iudex</groupId>
   <artifactId>iudex-jetty-httpclient</artifactId>
   <packaging>jar</packaging>
-  <version>1.3.0</version>
+  <version>1.4.0</version>
   <name>Iudex Jetty HTTP Client Adaptor</name>
 
   <parent>
     <groupId>iudex</groupId>
     <artifactId>iudex-parent</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -20,13 +20,13 @@
     <dependency>
       <groupId>iudex</groupId>
       <artifactId>iudex-http</artifactId>
-      <version>[1.3.0,1.3.999)</version>
+      <version>[1.4.0,1.4.999)</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>[7.5.4,7.6.9999)</version>
+      <version>[9.0.0.v20130308,9.0.9999)</version>
     </dependency>
 
   </dependencies>

data/test/setup.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2012 David Kellum
+# Copyright (c) 2008-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -35,10 +35,10 @@ module TestSetup
       def puts( *a );  $stdout.puts( *a ); end
     end
     MiniTest::Unit.output = TestOut.new
-    Logback[ 'org.eclipse.jetty.http.ssl.SslContextFactory' ].level =
-      Logback::WARN
+    Logback[ 'org.eclipse.jetty' ].level = :warn
   else
-    Logback.root.level = Logback::DEBUG
+    Logback[ 'org.eclipse.jetty' ].level = :info
+    Logback[ 'iudex.jettyhttpclient' ].level = :debug
   end
 
   ARGV.delete( '--debug' )

data/test/test_httpclient.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 
 #--
-# Copyright (c) 2008-2012 David Kellum
+# Copyright (c) 2008-2013 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -37,8 +37,9 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   import 'java.net.UnknownHostException'
   import 'java.net.URISyntaxException'
   import 'java.io.IOException'
-  import 'java.lang.IllegalStateException'
   import 'java.nio.channels.UnresolvedAddressException'
+  import 'org.eclipse.jetty.client.HttpResponseException'
+  import 'iudex.jettyhttpclient.Client$SessionAbort'
 
   CustomUnit.register
 
@@ -56,22 +57,18 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   import 'java.util.concurrent.ThreadPoolExecutor'
   import 'java.util.concurrent.ArrayBlockingQueue'
   import 'java.util.concurrent.TimeUnit'
-  import 'org.eclipse.jetty.util.thread.ExecutorThreadPool'
 
   def test_custom_executor
-    #FIXME: A bit shaky, fails under 3 threads?
     executor = ThreadPoolExecutor.new( 3, 10,
                                        10, TimeUnit::SECONDS,
                                        ArrayBlockingQueue.new( 10 ) )
-    pool = ExecutorThreadPool.new( executor )
-
-    with_new_client( :thread_pool => pool ) do |client|
+    with_new_client( :executor => executor ) do |client|
       with_session_handler( client, "/index" ) do |s,x|
         assert_equal( 200, s.status_code )
       end
     end
 
-    pool.stop
+    executor.shutdown
   end
 
   def test_200
@@ -109,11 +106,11 @@ class TestHTTPClient < MiniTest::Unit::TestCase
     req,rsp = nil
     with_new_client do |client|
       with_session_handler( client,
-                            "/echo/header/Accept?noop=3",
+                            "/echo/header/Accept?noop=3%267&o=9",
                             true,
                             { 'Accept' => 'text/plain;moo' } ) do |s,x|
         assert_equal( 200, s.status_code )
-        assert_equal( 'GET /echo/header/Accept?noop=3',
+        assert_equal( 'GET /echo/header/Accept?noop=3%267&o=9',
                       find_header( s.request_headers, "Request-Line" ) )
         assert_equal( 'text/plain;moo',
                       find_header( s.request_headers, 'Accept' ) )
@@ -130,7 +127,6 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   def test_unknown_host
     with_new_client( :timeout         => 12_000,
                      :connect_timeout => 10_000,
-                     :so_timeout      => 10_000,
                      :idle_timeout    => 10_000 ) do |client|
       with_session_handler( client,
                             "http://9xa9.a7v6a7lop-9m9q-w12.com" ) do |s,x|
@@ -190,12 +186,20 @@ class TestHTTPClient < MiniTest::Unit::TestCase
         assert_kind_of( TimeoutException, x )
       end
     end
-    sleep 0.70 # FIXME: Account for test server delay. Should be
-               # joined instead.
+  end
+
+  def test_slow_timeout
+    with_new_client( :short => true ) do |client|
+      with_session_handler( client, "/slow" ) do |s,x|
+        assert_equal( HTTPSession::TIMEOUT, s.status_code )
+        assert_kind_of( TimeoutException, x )
+      end
+    end
   end
 
   def test_redirect
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    skip "redirect url not accessible"
+    with_new_client( :follow_redirects => true ) do |client|
       with_session_handler( client, "/" ) do |s,x|
         assert_equal( 200, s.status_code )
         assert_equal( 'http://localhost:19292/index', s.url )
@@ -204,7 +208,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_redirect_with_query_string
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    skip "redirect url not accessible"
+    with_new_client( :follow_redirects => true ) do |client|
       with_session_handler( client, "/redirects/multi/2?sleep=0" ) do |s,x|
         assert_equal( 200, s.status_code )
         assert_equal( 'http://localhost:19292/redirects/multi/1?sleep=0',
@@ -216,7 +221,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_redirect_multi_host
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    skip "redirect url not accessible"
+    with_new_client( :follow_redirects => true ) do |client|
       rurl = 'http://127.0.0.1:19292/index'
       rurl_e = CGI.escape( rurl )
       with_session_handler( client, "/redirect?loc=#{rurl_e}" ) do |s,x|
@@ -228,7 +234,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
 
   def test_redirect_multi_host_bad
     skip( "Error: -1 java.lang.NumberFormatException" )
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    with_new_client( :follow_redirects => true ) do |client|
       rurl = 'http://localhost:19292/index'
       url = "http://127.0.0.1:19292?redirect?loc=" + CGI.escape( rurl )
       # Note >?<redirect? above
@@ -242,7 +248,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_redirect_multi_host_3
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    skip "redirect url not accessible"
+    with_new_client( :follow_redirects => true ) do |client|
       rurl = 'http://localhost:19292/index'
       url = "http://127.0.0.1:19292/redirect?loc=" + CGI.escape( rurl )
       url = "/redirect?loc=" + CGI.escape( url )
@@ -255,7 +262,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_redirect_multi_host_fragment
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    skip "redirect url not accessible"
+    with_new_client( :follow_redirects => true ) do |client|
       rurl = '/index#!foo'
       url = "/redirect?loc=" + CGI.escape( rurl )
 
@@ -267,7 +275,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_redirect_bad_host
-    with_new_client( :handle_redirects_internal => true ) do |client|
+    skip( "FIXME hangs" )
+    with_new_client( :follow_redirects => true ) do |client|
       rurl = CGI.escape( 'http://\bad.com/' )
       with_session_handler( client, "/redirect?loc=#{ rurl }" ) do |s,x|
         assert_equal( HTTPSession::INVALID_REDIRECT_URL, s.status_code )
@@ -277,8 +286,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_multi_redirect
-    with_new_client( :handle_redirects_internal => true,
-                     :max_redirects => 8 ) do |client|
+    skip "redirect url not accessible"
+    with_new_client( :follow_redirects => true ) do |client|
       with_session_handler( client, "/redirects/multi/6" ) do |s,x|
         assert_equal( 200, s.status_code )
         assert_nil x
@@ -297,23 +306,21 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   end
 
   def test_too_many_redirects
-    with_new_client( :handle_redirects_internal => true,
+    with_new_client( :follow_redirects => true,
                      :max_redirects => 18 ) do |client|
-      #FIXME: One redirect off somewhere? 19 fails.
       with_session_handler( client, "/redirects/multi/20" ) do |s,x|
-        assert_equal( 302, s.status_code, x )
+        assert_equal( HTTPSession::MAX_REDIRECTS_EXCEEDED, s.status_code )
       end
     end
   end
 
   def test_redirect_timeout
     skip( "Unreliable timeout with redirects, timing dependent" )
-    with_new_client( :handle_redirects_internal => true,
+    with_new_client( :follow_redirects => true,
                      :short => true ) do |client|
       with_session_handler( client, "/redirects/multi/3?sleep=0.40" ) do |s,x|
         assert_instance_of( TimeoutException, x )
       end
-      sleep 0.80
     end
   end
 
@@ -325,10 +332,11 @@ class TestHTTPClient < MiniTest::Unit::TestCase
       bs.accept { |sock| sock.write "FU Stinky\r\n" }
     end
 
-    #FIXME: IllegalStateException on bad HTTP response line?
     with_new_client do |client|
       with_session_handler( client, "http://localhost:19293/" ) do |s,x|
-        assert_instance_of( IllegalStateException, x )
+        assert_match( /(EofException|bad response|ClosedChannelException)/i,
+                      x.to_string )
+        assert_equal( -1, s.status_code )
       end
     end
 
@@ -348,7 +356,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
 
     with_new_client do |client|
       with_session_handler( client, "http://localhost:19293/" ) do |s,x|
-        assert_match( /EofException/i, x.class.name )
+        assert_match( /EofException|ClosedChannelException/i, x.class.name )
       end
     end
 
@@ -378,7 +386,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
 
     with_new_client do |client|
       with_session_handler( client, "http://localhost:19293/" ) do |s,x|
-        assert_match( /EofException/i, x.class.name )
+        assert_match( /EofException|ClosedChannelException/i, x.class.name )
       end
     end
 
@@ -409,7 +417,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
 
     with_new_client do |client|
       with_session_handler( client, "http://localhost:19293/" ) do |s,x|
-        assert_match( /EofException/i, x.class.name )
+        assert_match( /EofException|ClosedChannelException/i, x.class.name )
       end
     end
 
@@ -422,9 +430,8 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   def test_concurrent
     with_new_client( :timeout         => 18_000,
                      :connect_timeout => 15_000,
-                     :so_timeout      => 12_000,
                      :idle_timeout    => 12_000,
-                     :max_connections_per_address => 4 ) do |client|
+                     :max_connections_per_destination => 4 ) do |client|
 
       resps = []
       sessions = (1..19).map do |i|
@@ -443,12 +450,11 @@ class TestHTTPClient < MiniTest::Unit::TestCase
     end
   end
 
-  def test_maximum_connections_per_address
+  def test_maximum_connections_per_destination
     with_new_client( :timeout         => 12_000,
                      :connect_timeout => 10_000,
-                     :so_timeout      => 10_000,
                      :idle_timeout    => 10_000,
-                     :max_connections_per_address => 2 ) do |client|
+                     :max_connections_per_destination => 2 ) do |client|
 
       resps = []
       sessions = (1..7).map do |i|
@@ -469,7 +475,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   def test_abort_when_too_large
     with_new_client do |client|
       with_session_handler( client, "/giant" ) do |s,x|
-        assert_nil( x )
+        assert_kind_of( SessionAbort, x )
         assert_equal( HTTPSession::TOO_LARGE, s.status_code )
       end
     end
@@ -479,7 +485,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
     with_new_client do |client|
       client.max_content_length = 1
       with_session_handler( client, "/atom.xml" ) do |s,x|
-        assert_nil( x )
+        assert_kind_of( SessionAbort, x )
         assert_equal( HTTPSession::TOO_LARGE_LENGTH, s.status_code )
       end
     end
@@ -489,7 +495,7 @@ class TestHTTPClient < MiniTest::Unit::TestCase
     with_new_client do |client|
       client.accepted_content_types = ContentTypeSet.new( [ "gold/*" ] )
       with_session_handler( client, "/giant" ) do |s,x|
-        assert_nil( x )
+        assert_kind_of( SessionAbort, x )
         assert_equal( HTTPSession::NOT_ACCEPTED, s.status_code )
       end
     end
@@ -531,18 +537,14 @@ class TestHTTPClient < MiniTest::Unit::TestCase
   def with_new_client( opts = {} )
     o = if opts.delete( :short )
           { :timeout          => 400,
-            :so_timeout       => 200,
             :connect_timeout  => 200,
             :idle_timeout     => 200 }
         else
           { :timeout          => 5000,
-            :so_timeout       => 4000,
             :connect_timeout  => 3000,
             :idle_timeout     => 2000 }
         end
 
-    o = o.merge( { :max_retries      => 0,
-                   :connect_blocking => false } )
     o = o.merge( opts )
 
     client = JettyHTTPClient.create_client( o )

metadata

@@ -2,14 +2,14 @@
 name: iudex-jetty-httpclient
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.3.0
+  version: 1.4.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iudex-http
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     none: false
   prerelease: false
   type: :runtime
@@ -33,19 +33,19 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 7.5.4
+        version: 9.0.0.5
     - - <
       - !ruby/object:Gem::Version
-        version: '7.7'
+        version: '9.1'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 7.5.4
+        version: 9.0.0.5
     - - <
       - !ruby/object:Gem::Version
-        version: '7.7'
+        version: '9.1'
     none: false
   prerelease: false
   type: :runtime
@@ -71,13 +71,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 4.7.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 4.7.4
     none: false
   prerelease: false
   type: :development
@@ -87,13 +87,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     none: false
   prerelease: false
   type: :development
@@ -147,7 +147,7 @@ files:
 - lib/iudex-jetty-httpclient.rb
 - test/setup.rb
 - test/test_httpclient.rb
-- lib/iudex-jetty-httpclient/iudex-jetty-httpclient-1.3.0.jar
+- lib/iudex-jetty-httpclient/iudex-jetty-httpclient-1.4.0.jar
 homepage: http://iudex.gravitext.com
 licenses: []
 post_install_message: