Skip to content

Commit

Permalink
Minor spelling fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
bltb committed Feb 27, 2017
1 parent c674545 commit aae245b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions hystrix-contrib/hystrix-javanica/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ The return type of command method should be Future that indicates that a command

## Reactive Execution

To performe "Reactive Execution" you should return an instance of `Observable` in your command method as in the example below:
To perform "Reactive Execution" you should return an instance of `Observable` in your command method as in the example below:

```java
@HystrixCommand
Expand Down Expand Up @@ -330,7 +330,7 @@ If `userResource.getUserById(id);` throws an exception that type is _BadRequestE

It is worth noting that by default a caller will always get the root cause exception e.g. ``BadRequestException``, never ``HystrixBadRequestException`` or ``HystrixRuntimeException`` (except the case when executed code explicitly throws those exceptions).

Optionally this exception un-wraping can be disabled for ``HystrixRuntimeException`` by using ``raiseHystrixExceptions`` i.e. all exceptions that are not ignored are raised as the _cause_ of a ``HystrixRuntimeException``:
Optionally this exception un-wrapping can be disabled for ``HystrixRuntimeException`` by using ``raiseHystrixExceptions`` i.e. all exceptions that are not ignored are raised as the _cause_ of a ``HystrixRuntimeException``:

```java
@HystrixCommand(
Expand Down Expand Up @@ -433,7 +433,7 @@ private User getUserByIdCacheKeyMethod(String id);
```
**Cache key generator**

Jacanica has only one cache key generator **HystrixCacheKeyGenerator** that generates a _HystrixGeneratedCacheKey_ based on _CacheInvocationContext_. Implementation is thread-safe.
Javanica has only one cache key generator **HystrixCacheKeyGenerator** that generates a _HystrixGeneratedCacheKey_ based on _CacheInvocationContext_. Implementation is thread-safe.
Parameters of an annotated method are selected by the following rules:
- If no parameters are annotated with _@CacheKey_ then all parameters are included
- If one or more _@CacheKey_ annotations exist only those parameters with the _@CacheKey_ annotation are included
Expand Down Expand Up @@ -709,7 +709,7 @@ To set collapser [properties](https://github.com/Netflix/Hystrix/wiki/Configurat
Read more about Hystrix request collapsing [here] (https://github.com/Netflix/Hystrix/wiki/How-it-Works#wiki-RequestCollapsing)

**Collapser error processing**
Bath command can have a fallback method.
Batch command can have a fallback method.
Example:

```java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*/
public abstract class AsyncResult<T> implements Future<T>, ClosureCommand<T> {

private static final String ERROR_MSG = "AsyncResult is just a stab and cannot be used as complete implementation of Future";
private static final String ERROR_MSG = "AsyncResult is just a stub and cannot be used as complete implementation of Future";

@Override
public boolean cancel(boolean mayInterruptIfRunning) throws UnsupportedOperationException {
Expand Down

0 comments on commit aae245b

Please sign in to comment.