[axis-axis2-java-core] 25/31: Merge r1780726 to the 1.7 branch.

[billblough]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 994e8f3bd03c16c715e22f8b306a679f5887ca09
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sun Jan 6 17:11:52 2019 +0000

    Merge r1780726 to the 1.7 branch.
---
 .../java/org/apache/axis2/testutils/ClientHelper.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java 
b/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
index 538e311..ba64885 100644
--- 
a/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
+++ 
b/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
@@ -25,7 +25,7 @@ import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.junit.rules.ExternalResource;
 
-public final class ClientHelper extends ExternalResource {
+public class ClientHelper extends ExternalResource {
     private final AbstractAxis2Server server;
     private final String repositoryPath;
     private ConfigurationContext configurationContext;
@@ -40,25 +40,31 @@ public final class ClientHelper extends ExternalResource {
     }
 
     @Override
-    protected void before() throws Throwable {
+    protected final void before() throws Throwable {
         configurationContext =
                 
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
     }
 
     @Override
-    protected void after() {
+    protected final void after() {
         configurationContext = null;
     }
 
-    public ServiceClient createServiceClient(String serviceName) throws 
AxisFault {
+    public final ServiceClient createServiceClient(String serviceName) throws 
Exception {
         ServiceClient serviceClient = new ServiceClient(configurationContext, 
null);
         
serviceClient.getOptions().setTo(server.getEndpointReference(serviceName));
+        configureServiceClient(serviceClient);
         return serviceClient;
     }
 
-    public <T extends Stub> T createStub(Class<T> type, String serviceName) 
throws Exception {
-        return type
+    public final <T extends Stub> T createStub(Class<T> type, String 
serviceName) throws Exception {
+        T stub = type
                 .getConstructor(ConfigurationContext.class, String.class)
                 .newInstance(configurationContext, 
server.getEndpoint(serviceName));
+        configureServiceClient(stub._getServiceClient());
+        return stub;
+    }
+
+    protected void configureServiceClient(ServiceClient serviceClient) throws 
Exception {
     }
 }