Skip to content

Commit 998c4a4

Browse files
authored
Merge pull request #1488 from bltb/spelling
Minor spelling fixes.
2 parents c674545 + aae245b commit 998c4a4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

hystrix-contrib/hystrix-javanica/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The return type of command method should be Future that indicates that a command
107107

108108
## Reactive Execution
109109

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

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

331331
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).
332332

333-
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``:
333+
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``:
334334

335335
```java
336336
@HystrixCommand(
@@ -433,7 +433,7 @@ private User getUserByIdCacheKeyMethod(String id);
433433
```
434434
**Cache key generator**
435435

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

711711
**Collapser error processing**
712-
Bath command can have a fallback method.
712+
Batch command can have a fallback method.
713713
Example:
714714

715715
```java

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/command/AsyncResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
public abstract class AsyncResult<T> implements Future<T>, ClosureCommand<T> {
2929

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

3232
@Override
3333
public boolean cancel(boolean mayInterruptIfRunning) throws UnsupportedOperationException {

0 commit comments

Comments
 (0)