[java] Changing order of parameters in decorators

Author: barancev

java/client/src/org/openqa/selenium/support/decorators/DefaultDecorated.java

@@ -50,12 +50,12 @@ public Object call(Method method, Object[] args) throws Throwable {
 
   @Override
   public void afterCall(Method method, Object result, Object[] args) {
-    getDecorator().afterCallGlobal(this, method, result, args);
+    getDecorator().afterCallGlobal(this, method, args, result);
   }
 
   @Override
   public Object onError(Method method, InvocationTargetException e, Object[] args) throws Throwable {
-    return getDecorator().onErrorGlobal(this, method, e, args);
+    return getDecorator().onErrorGlobal(this, method, args, e);
   }
 
   @Override

java/client/src/org/openqa/selenium/support/decorators/WebDriverDecorator.java

@@ -91,9 +91,11 @@ public Object callGlobal(Decorated<?> target, Method method, Object[] args) thro
     return decorateResult(method.invoke(target.getOriginal(), args));
   }
 
-  public void afterCallGlobal(Decorated<?> target, Method method, Object res, Object[] args) {}
+  public void afterCallGlobal(Decorated<?> target, Method method, Object[] args, Object res) {}
 
-  public Object onErrorGlobal(Decorated<?> target, Method method, InvocationTargetException e, Object[] args) throws Throwable {
+  public Object onErrorGlobal(Decorated<?> target, Method method, Object[] args,
+                              InvocationTargetException e) throws Throwable
+  {
     throw e.getTargetException();
   }
 

java/client/src/org/openqa/selenium/support/events/EventFiringDecorator.java

@@ -172,21 +172,22 @@ public void beforeCallGlobal(Decorated<?> target, Method method, Object[] args)
   }
 
   @Override
-  public void afterCallGlobal(Decorated<?> target, Method method, Object result, Object[] args) {
-    super.afterCallGlobal(target, method, result, args);
+  public void afterCallGlobal(Decorated<?> target, Method method, Object[] args, Object result) {
+    super.afterCallGlobal(target, method, args, result);
     listeners.forEach(listener -> fireAfterEvents(listener, target, method, result, args));
   }
 
   @Override
-  public Object onErrorGlobal(Decorated<?> target, Method method, InvocationTargetException e, Object[] args) throws Throwable {
+  public Object onErrorGlobal(Decorated<?> target, Method method, Object[] args,
+                              InvocationTargetException e) throws Throwable {
     listeners.forEach(listener -> {
       try {
         listener.onError(target.getOriginal(), method, args, e);
       } catch (Throwable t) {
         logger.log(Level.WARNING, t.getMessage(), t);
       }
     });
-    return super.onErrorGlobal(target, method, e, args);
+    return super.onErrorGlobal(target, method, args, e);
   }
 
   private void fireBeforeEvents(WebDriverListener listener, Decorated<?> target, Method method, Object[] args) {

java/client/test/org/openqa/selenium/support/decorators/IntegrationTest.java

@@ -47,7 +47,7 @@ public void beforeCallGlobal(Decorated<?> target, Method method, Object[] args)
     }
 
     @Override
-    public void afterCallGlobal(Decorated<?> target, Method method, Object result, Object[] args) {
+    public void afterCallGlobal(Decorated<?> target, Method method, Object[] args, Object result) {
       counterAfter++;
     }