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 637cb73bf6b85dd1301bc6c9914b1ede32202a6b
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sun Jan 6 18:06:23 2019 +0000
Merge r1819304 to the 1.7 branch.
---
.../axis2/testutils/AbstractAxis2Server.java | 25 +++++----------------
....java => AbstractConfigurationContextRule.java} | 26 ++--------------------
.../org/apache/axis2/testutils/ClientHelper.java | 24 ++++++--------------
3 files changed, 14 insertions(+), 61 deletions(-)
diff --git
a/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
b/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
index a5cd120..561b48c 100644
---
a/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
+++
b/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
@@ -23,35 +23,20 @@ import javax.net.ssl.SSLContext;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.engine.AxisConfiguration;
-import org.junit.rules.ExternalResource;
-public abstract class AbstractAxis2Server extends ExternalResource {
- private final String repositoryPath;
+public abstract class AbstractAxis2Server extends
AbstractConfigurationContextRule {
private final AxisServiceFactory[] serviceFactories;
- private ConfigurationContext configurationContext;
public AbstractAxis2Server(String repositoryPath, AxisServiceFactory...
serviceFactories) {
- this.repositoryPath = repositoryPath;
+ super(repositoryPath);
this.serviceFactories = serviceFactories;
}
- final String getRepositoryPath() {
- return repositoryPath;
- }
-
- public final ConfigurationContext getConfigurationContext() {
- if (configurationContext == null) {
- throw new IllegalStateException();
- }
- return configurationContext;
- }
-
@Override
protected void before() throws Throwable {
- configurationContext =
-
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
+ super.before();
+ ConfigurationContext configurationContext = getConfigurationContext();
AxisConfiguration axisConfiguration =
configurationContext.getAxisConfiguration();
for (AxisServiceFactory serviceFactory : serviceFactories) {
axisConfiguration.addService(serviceFactory.createService(axisConfiguration));
@@ -62,7 +47,7 @@ public abstract class AbstractAxis2Server extends
ExternalResource {
@Override
protected void after() {
stopServer();
- configurationContext = null;
+ super.after();
}
protected abstract void startServer(ConfigurationContext
configurationContext) throws Throwable;
diff --git
a/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
b/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
similarity index 58%
copy from
modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
copy to
modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
index a5cd120..444a5aa 100644
---
a/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
+++
b/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractConfigurationContextRule.java
@@ -18,23 +18,16 @@
*/
package org.apache.axis2.testutils;
-import javax.net.ssl.SSLContext;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.engine.AxisConfiguration;
import org.junit.rules.ExternalResource;
-public abstract class AbstractAxis2Server extends ExternalResource {
+public abstract class AbstractConfigurationContextRule extends
ExternalResource {
private final String repositoryPath;
- private final AxisServiceFactory[] serviceFactories;
private ConfigurationContext configurationContext;
- public AbstractAxis2Server(String repositoryPath, AxisServiceFactory...
serviceFactories) {
+ public AbstractConfigurationContextRule(String repositoryPath) {
this.repositoryPath = repositoryPath;
- this.serviceFactories = serviceFactories;
}
final String getRepositoryPath() {
@@ -52,25 +45,10 @@ public abstract class AbstractAxis2Server extends
ExternalResource {
protected void before() throws Throwable {
configurationContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
- AxisConfiguration axisConfiguration =
configurationContext.getAxisConfiguration();
- for (AxisServiceFactory serviceFactory : serviceFactories) {
-
axisConfiguration.addService(serviceFactory.createService(axisConfiguration));
- }
- startServer(configurationContext);
}
@Override
protected void after() {
- stopServer();
configurationContext = null;
}
-
- protected abstract void startServer(ConfigurationContext
configurationContext) throws Throwable;
- protected abstract void stopServer();
-
- public abstract boolean isSecure();
- public abstract SSLContext getClientSSLContext() throws Exception;
- public abstract int getPort();
- public abstract String getEndpoint(String serviceName) throws AxisFault;
- public abstract EndpointReference getEndpointReference(String serviceName)
throws AxisFault;
}
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 71d5af4..374b7aa 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
@@ -30,17 +30,13 @@ import javax.xml.namespace.QName;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.client.Stub;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.junit.rules.ExternalResource;
-public class ClientHelper extends ExternalResource {
+public class ClientHelper extends AbstractConfigurationContextRule {
private final AbstractAxis2Server server;
- private final String repositoryPath;
- private ConfigurationContext configurationContext;
public ClientHelper(AbstractAxis2Server server, String repositoryPath) {
+ super(repositoryPath);
this.server = server;
- this.repositoryPath = repositoryPath;
}
public ClientHelper(AbstractAxis2Server server) {
@@ -49,21 +45,15 @@ public class ClientHelper extends ExternalResource {
@Override
protected final void before() throws Throwable {
- configurationContext =
-
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
+ super.before();
SSLContext sslContext = server.getClientSSLContext();
if (sslContext != null) {
- configurationContext.setProperty(SSLContext.class.getName(),
sslContext);
+ getConfigurationContext().setProperty(SSLContext.class.getName(),
sslContext);
}
}
- @Override
- protected final void after() {
- configurationContext = null;
- }
-
public final ServiceClient createServiceClient(String serviceName) throws
Exception {
- ServiceClient serviceClient = new ServiceClient(configurationContext,
null);
+ ServiceClient serviceClient = new
ServiceClient(getConfigurationContext(), null);
serviceClient.getOptions().setTo(server.getEndpointReference(serviceName));
configureServiceClient(serviceClient);
return serviceClient;
@@ -84,7 +74,7 @@ public class ClientHelper extends ExternalResource {
} else {
handler = null;
}
- ServiceClient serviceClient = new ServiceClient(configurationContext,
+ ServiceClient serviceClient = new
ServiceClient(getConfigurationContext(),
new URL(null, server.getEndpoint(serviceName) + "?wsdl",
handler), wsdlServiceName, portName);
configureServiceClient(serviceClient);
return serviceClient;
@@ -93,7 +83,7 @@ public class ClientHelper extends ExternalResource {
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));
+ .newInstance(getConfigurationContext(),
server.getEndpoint(serviceName));
configureServiceClient(stub._getServiceClient());
return stub;
}
