fix: call afterInitialize on all accessors

Author: mattnichols

gateway/src/main/java/com/mx/path/gateway/configuration/AccessorStackConfigurator.java

@@ -151,7 +151,7 @@ public final Accessor buildFromNode(String clientId, ObjectMap node) {
     AccessorScope accessorScope = determineAccessorScope(node, accessorType);
     Class<?> proxyType = AccessorProxyMap.get(accessorScope.getName(), Accessor.getAccessorBase(accessorType));
 
-    invokeAfterInitializeMethods(accessorType);
+    invokeAfterInitializeMethods(accessorType, clientId);
 
     return new ClassHelper().buildInstance(Accessor.class, proxyType, configurationBuilder.build(), accessorType);
   }
@@ -198,6 +198,8 @@ public final Accessor buildFromParent(String name, String clientId, Accessor par
     Class<?> proxyType = AccessorProxyMap.get(accessorScope.get(), Accessor.getAccessorBase(accessorType.get()));
     accessor = new ClassHelper().buildInstance(Accessor.class, proxyType, configuration.build(), accessorType.get());
 
+    invokeAfterInitializeMethods(accessorType.get(), clientId);
+
     return accessor;
   }
 
@@ -330,13 +332,17 @@ private void validateServiceScope(Class<? extends Accessor> accessor) {
     }
   }
 
-  private void invokeAfterInitializeMethods(Class<?> accessorClass) {
+  private void invokeAfterInitializeMethods(Class<?> accessorClass, String clientId) {
     Method[] methods = accessorClass.getMethods();
 
     for (Method method : methods) {
       if (method.isAnnotationPresent(AfterAccessorInitialize.class) && (method.getModifiers() & Modifier.STATIC) != 0) {
         try {
-          method.invoke(null);
+          if (method.getParameterCount() == 0) {
+            method.invoke(null);
+          } else if (method.getParameterCount() == 1) {
+            method.invoke(null, clientId);
+          }
         } catch (Exception e) {
           throw new RuntimeException("Failed to invoke @AfterAccessorInitialize method: " + method.getName(), e);
         }

gateway/src/test/groovy/com/mx/path/gateway/configuration/AccessorStackConfiguratorTest.groovy

@@ -18,12 +18,20 @@ class AccessorStackConfiguratorTest extends Specification {
     @AfterAccessorInitialize
     static void afterInitialize() {
     }
+
+    @AfterAccessorInitialize
+    static void afterInitializeWithClientId(String clientId) {
+    }
   }
 
   class ChildMockAccessor extends MockAccessor {
     @AfterAccessorInitialize
     static void afterInitializeChild() {
     }
+
+    @AfterAccessorInitialize
+    static void afterInitializeChildWithClientId(String clientId) {
+    }
   }
 
   AccessorStackConfigurator subject
@@ -48,22 +56,26 @@ class AccessorStackConfiguratorTest extends Specification {
 
   def "invoke afterInitializeMethods"() {
     when:
-    Method method = subject.class.getDeclaredMethod("invokeAfterInitializeMethods", Class)
+    Method method = subject.class.getDeclaredMethod("invokeAfterInitializeMethods", Class, String)
     method.setAccessible(true)
-    method.invoke(subject, MockAccessor.class)
+    method.invoke(subject, MockAccessor.class, "clientId")
 
     then:
     mockAccessor.verify({ MockAccessor.afterInitialize() }, times(1))
+    mockAccessor.verify({ MockAccessor.afterInitializeWithClientId("clientId") }, times(1))
   }
 
   def "invoke both afterInitializeMethods"() {
     when:
-    Method method = subject.class.getDeclaredMethod("invokeAfterInitializeMethods", Class)
+    Method method = subject.class.getDeclaredMethod("invokeAfterInitializeMethods", Class, String)
     method.setAccessible(true)
-    method.invoke(subject, ChildMockAccessor.class)
+    method.invoke(subject, ChildMockAccessor.class, "clientId")
 
     then:
     mockAccessor.verify({ MockAccessor.afterInitialize() }, times(1))
     childMockAccessor.verify({ ChildMockAccessor.afterInitializeChild() }, times(1))
+
+    mockAccessor.verify({ MockAccessor.afterInitializeWithClientId("clientId") }, times(1))
+    childMockAccessor.verify({ ChildMockAccessor.afterInitializeChildWithClientId("clientId") }, times(1))
   }
 }