Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hystrix 1.4 - Async/Non-Blocking #218

Merged
merged 39 commits into from
Mar 11, 2014
Merged

Hystrix 1.4 - Async/Non-Blocking #218

merged 39 commits into from
Mar 11, 2014

Commits on Feb 12, 2014

  1. Hystrix non blocking command, a copy paste of hystrix command with

    changes to support non blocking behavior
    neerajrj authored and benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    1eb528e View commit details
    Browse the repository at this point in the history
  2. fixed test cases

    neerajrj authored and benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    d31dc2d View commit details
    Browse the repository at this point in the history
  3. add comments and copyrights

    neerajrj authored and benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    a0fc403 View commit details
    Browse the repository at this point in the history
  4. minor formatting

    neerajrj authored and benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    a3c6d8a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f3c5bf0 View commit details
    Browse the repository at this point in the history
  6. Organize Imports

    benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    146898b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9f8c742 View commit details
    Browse the repository at this point in the history
  8. Upgrade HystrixCommand to RxJava 0.17

    - updated unit test that no longer worked with new Scheduler implementation
    benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    545ee76 View commit details
    Browse the repository at this point in the history
  9. Upgrade HystrixNonBlockingCommand to RxJava 0.17

    - open questions on this class
    benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    56527c4 View commit details
    Browse the repository at this point in the history
  10. Moved Unit Tests

    - they have outgrown the inner class model
    - I have made many things package accessible to make tests work
    - several are still breaking because they are accessing private members and I have not decided how to handle them
    benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    7f031e5 View commit details
    Browse the repository at this point in the history
  11. Opened Access for Unit Tests

    - all unit tests compiling
    -  not all are passing as the RxJava 0.17 upgrade is still in process
    benjchristensen committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    b2fdc25 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2014

  1. Configuration menu
    Copy the full SHA
    09f2c23 View commit details
    Browse the repository at this point in the history
  2. Fixed Unit Test: Subscription Behavior Changed

    RxJava 0.17 handles synchronous Subscriptions now so this code needed to be changed otherwise the exceptions never got thrown since the isUnsubscribed() would already be true.
    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    98ee491 View commit details
    Browse the repository at this point in the history
  3. Fixed Unit Test: Class Names

    Deriving the full class names for these inner classes was being done wrong and resulted in bad class names when the unit tests got moved.
    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    e4759d4 View commit details
    Browse the repository at this point in the history
  4. Make UnitTests use NonBlocking Observables

    This reveals the bugs in the current HystrixNonBlockingCommand implementation.
    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    1e536ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a296d80 View commit details
    Browse the repository at this point in the history
  6. Format Code

    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    3ec6e4b View commit details
    Browse the repository at this point in the history
  7. RxJava 0.17.0-RC3

    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    b4c3363 View commit details
    Browse the repository at this point in the history
  8. HystrixObservableCommand

    - unit tests are all passing with both async and sync Observables
    - defaults to semaphore isolation but allows thread isolation if an Observable source is synchronous
    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    706a0f2 View commit details
    Browse the repository at this point in the history
  9. RxJava 0.17.0-RC4

    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    5aeab65 View commit details
    Browse the repository at this point in the history
  10. Remove debug println

    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    a8ea50f View commit details
    Browse the repository at this point in the history
  11. And another debug println ...

    Whoops.
    benjchristensen committed Feb 21, 2014
    Configuration menu
    Copy the full SHA
    bfaba6f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2014

  1. TimeoutObservable -> HystrixObservableTimeoutOperator

    - Use "Operator" name as that's what it is.
    - Use HystrixObservableTimeoutOperator instead of TimeoutOperator so in a stacktrace it's clear it's the Hystrix variant and not the normal RxJava TimeoutOperator.
    benjchristensen committed Feb 23, 2014
    Configuration menu
    Copy the full SHA
    9a5adde View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. HystrixObservableCommand Fixes

    - all unit tests are now passing with semaphore and thread isolation
    benjchristensen committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    15898cf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8bca0cb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1ada23e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    42eb8bd View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ad06ecd View commit details
    Browse the repository at this point in the history
  6. RxJava 0.17.0-RC6

    benjchristensen committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    c59ed29 View commit details
    Browse the repository at this point in the history
  7. Fix isExecutedInThread

    Update tests to assert isExecutedInThread true/false so we are sure the tests are getting what they expect.
    benjchristensen committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    ac9768d View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2014

  1. Configuration menu
    Copy the full SHA
    94c708f View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2014

  1. Configuration menu
    Copy the full SHA
    e0826d3 View commit details
    Browse the repository at this point in the history
  2. HystrixCommand composes HystrixObservableCommand

    Eliminate the AbstractHystrixCommand inheritance.
    benjchristensen committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    d2bf17f View commit details
    Browse the repository at this point in the history
  3. Organize Imports

    benjchristensen committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    460aa8e View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2014

  1. Configuration menu
    Copy the full SHA
    beb1fd6 View commit details
    Browse the repository at this point in the history
  2. Revert HystrixExecutable change

    ... breaks things (thought nothing would implement this interface, but alas some things do).
    benjchristensen committed Feb 28, 2014
    Configuration menu
    Copy the full SHA
    999e7d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2014

  1. BugFix: Plugin WrapCallable of RequestContext in Timeout

    Fixes issue reported in #212
    This was also fixed in 1.3.10
    benjchristensen committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    fc99fce View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2014

  1. Merge branch 'hystrix-1.4-non-blocking' into hystrix-1-4-non-blocking…

    …-merge
    
    Conflicts:
    	hystrix-core/build.gradle
    	hystrix-core/src/main/java/com/netflix/hystrix/HystrixCollapser.java
    	hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java
    	hystrix-core/src/main/java/com/netflix/hystrix/strategy/HystrixPlugins.java
    	hystrix-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixConcurrencyStrategy.java
    	hystrix-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContexSchedulerAction.java
    	hystrix-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextCallable.java
    	hystrix-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextRunnable.java
    	hystrix-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextScheduler.java
    benjchristensen committed Mar 10, 2014
    Configuration menu
    Copy the full SHA
    b97165e View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2014

  1. HystrixCollapser onComplete fix

    Wait until onComplete before emitting the results so that all metrics, event logs, etc are done.
    benjchristensen committed Mar 11, 2014
    Configuration menu
    Copy the full SHA
    005a344 View commit details
    Browse the repository at this point in the history