Merge pull request Netflix#1221 from dysmento/its-grammar

improve usages of "its" and "it's"
rwilliams-r7 · May 26, 2016 · 41804d2 · 41804d2
2 parents b0ce3b3 + be95845
commit 41804d2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.../src/main/java/com/netflix/hystrix/contrib/javanica/aop/aspectj/HystrixCommandAspect.java b/.../src/main/java/com/netflix/hystrix/contrib/javanica/aop/aspectj/HystrixCommandAspect.java
@@ -172,7 +172,7 @@ public MetaHolder create(Object proxy, Method collapserMethod, Object obj, Objec
                 throw new IllegalStateException("batch method must be annotated with HystrixCommand annotation");
             }
             // method of batch hystrix command must be passed to metaholder because basically collapser doesn't have any actions
-            // that should be invoked upon intercepted method, its required only for underlying batch command
+            // that should be invoked upon intercepted method, it's required only for underlying batch command
             MetaHolder.Builder builder = MetaHolder.builder()
                     .args(args).method(batchCommandMethod).obj(obj).proxyObj(proxy)
                     .defaultGroupKey(obj.getClass().getSimpleName())

diff --git a/...rix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/FallbackMethod.java b/...rix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/utils/FallbackMethod.java
@@ -142,14 +142,14 @@ private void validatePlainReturnType(Method commandMethod, Method fallbackMethod
     private void validatePlainReturnType(Class<?> commandReturnType, Class<?> fallbackReturnType, Method commandMethod, Method fallbackMethod) {
         if (!commandReturnType.isAssignableFrom(fallbackReturnType)) {
             throw new FallbackDefinitionException(createErrorMsg(commandMethod, fallbackMethod, "Fallback method '"
-                    + fallbackMethod + "' must return: " + commandReturnType + " or it's subclass"));
+                    + fallbackMethod + "' must return: " + commandReturnType + " or its subclass"));
         }
     }
 
     private void validateParametrizedType(Type commandReturnType, Type fallbackReturnType, Method commandMethod, Method fallbackMethod) {
         if (!commandReturnType.equals(fallbackReturnType)) {
             throw new FallbackDefinitionException(createErrorMsg(commandMethod, fallbackMethod, "Fallback method '"
-                    + fallbackMethod + "' must return: " + commandReturnType + " or it's subclass"));
+                    + fallbackMethod + "' must return: " + commandReturnType + " or its subclass"));
         }
     }
 

diff --git a/...ava/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedArchaiusProperty.java b/...ava/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedArchaiusProperty.java
@@ -86,7 +86,7 @@ protected void checkAndFlip() {
             }
 
             if (this.isValueAcceptable()) {
-                logger.debug("Flipping property: {} to use it's current value: {}", getName(), getValue());
+                logger.debug("Flipping property: {} to use its current value: {}", getName(), getValue());
                 pReference.set(this);
             } else {
                 logger.debug("Flipping property: {} to use NEXT property: {}", getName(), next);

diff --git a/...c/main/java/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedProperty.java b/...c/main/java/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedProperty.java
@@ -87,7 +87,7 @@ protected void checkAndFlip() {
             }
 
             if (this.isValueAcceptable()) {
-                logger.debug("Flipping property: {} to use it's current value: {}", getName(), getValue());
+                logger.debug("Flipping property: {} to use its current value: {}", getName(), getValue());
                 pReference.set(this);
             } else {
                 logger.debug("Flipping property: {} to use NEXT property: {}", getName(), next);