[cxf] branch master updated (ed0c7fe -> df1c14e)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from ed0c7fe Fixing minor typo in comment new eeacfd4 systests: introduce AbstractServerTestServerBase new df1c14e cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../cxf/endpoint/dynamic/DynamicClientFactory.java | 12 +-- .../org/apache/cxf/frontend/ClientFactoryBean.java | 4 +- .../cxf/frontend/ClientProxyFactoryBean.java | 3 +- .../java/org/apache/cxf/frontend/WSDLGetUtils.java | 7 +- .../cxf/frontend/spring/ClientServerTest.java | 4 +- .../apache/cxf/systest/jaxrs/AsyncResource.java| 4 +- .../cxf/systest/jaxrs/BookContinuationServer.java | 23 ++--- .../systest/jaxrs/BookCxfContinuationServer.java | 23 ++--- .../systest/jaxrs/BookCxfContinuationStore.java| 14 +-- .../org/apache/cxf/systest/jaxrs/BookServer.java | 111 + .../org/apache/cxf/systest/jaxrs/BookServer20.java | 36 ++- .../cxf/systest/jaxrs/BookServerAsyncClient.java | 36 ++- .../jaxrs/BookServerResourceCreatedOutside.java| 32 ++ .../BookServerResourceCreatedSpringProviders.java | 12 +-- .../apache/cxf/systest/jaxrs/BookServerSub.java| 31 ++ .../cxf/systest/jaxrs/BookServerThrottled.java | 39 ++-- .../systest/jaxrs/JAXRS20ClientServerBookTest.java | 2 +- .../cxf/systest/jaxrs/JAXRSAtomBookTest.java | 8 +- .../jaxrs/JAXRSClientServerQueryParamBookTest.java | 2 +- ...RSClientServerQueryParamCollectionBookTest.java | 2 +- ...ClientServerResourceCreatedOutsideBookTest.java | 33 ++ ...entServerResourceCreatedSpringProviderTest.java | 16 +-- .../jaxrs/JAXRSClientServerSpringBookTest.java | 29 ++ .../jaxrs/JAXRSClientServerStreamingTest.java | 29 ++ .../JAXRSClientServerUserResourceAsteriskTest.java | 39 ++-- .../JAXRSClientServerUserResourceDefaultTest.java | 32 ++ .../jaxrs/JAXRSClientServerUserResourceTest.java | 37 ++- .../apache/cxf/systest/jaxrs/JAXRSFiltersTest.java | 37 +++ .../jaxrs/JAXRSMultipartLocalTransportTest.java| 2 +- .../cxf/systest/jaxrs/JAXRSMultipartTest.java | 4 +- .../apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java | 8 +- .../apache/cxf/systest/jaxrs/MultipartServer.java | 29 ++ .../AbstractSwagger2ServiceDescriptionTest.java| 26 ++--- .../description/Swagger2CustomPropertiesTest.java | 6 +- .../Swagger2FilterServiceDescriptionTest.java | 4 +- ...Swagger2NonAnnotatedServiceDescriptionTest.java | 9 +- .../Swagger2RegularServiceDescriptionTest.java | 4 +- .../Swagger2XForwardedDescriptionTest.java | 1 - .../SwaggerToOpenApiConversionTest.java| 25 ++--- .../description/SwaggerUiConfigurationTest.java| 18 +--- .../AbstractOpenApiServiceDescriptionTest.java | 27 ++--- ...enApiContextBasedConfigApplicationOnlyTest.java | 30 +++--- .../openapi/OpenApiContextBasedConfigTest.java | 31 +++--- .../openapi/OpenApiCustomPropertiesTest.java | 6 +- .../openapi/OpenApiCustomizerSubclassTest.java | 24 + .../description/openapi/OpenApiCustomizerTest.java | 14 +-- .../OpenApiNonAnnotatedServiceDescriptionTest.java | 9 +- .../description/openapi/OpenApiPropertiesTest.java | 6 +- .../OpenApiRegularServiceDescriptionTest.java | 4 +- .../extraction/JAXRSClientServerTikaTest.java | 27 ++--- .../cxf/systest/jaxrs/form/FormBehaviorTest.java | 29 ++ .../cxf/systest/jaxrs/logging/LoggingServer.java | 23 ++--- .../jaxrs/metrics/JAXRSServerMetricsTest.java | 31 ++ .../systest/jaxrs/provider/JAXBProviderTest.java | 29 ++ .../jaxrs/provider/JsrJsonbProviderTest.java | 29 ++ .../jaxrs/provider/JsrJsonpProviderTest.java | 33 +++--- .../jaxrs/reactive/CompletableFutureServer.java| 37 ++- .../jaxrs/reactive/JAXRSCompletionStageTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava2MaybeTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava2SingleTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava3MaybeTest.java | 2 +- .../jaxrs/reactive/JAXRSRxJava3SingleTest.java | 2 +- .../jaxrs/reactive/RxJava2FlowableServer.java | 39 ++-- .../systest/jaxrs/reactive/RxJava2MaybeServer.java | 34 ++- .../jaxrs/reactive/RxJava2ObservableServer.java| 35 ++- .../jaxrs/reactive/RxJava2SingleServer.java| 34 ++- .../jaxrs/reactive/RxJava3FlowableServer.java | 39 ++-- .../systest/jaxrs/reactive/RxJava3MaybeServer.java | 34 ++- .../jaxrs/reactive/RxJava3ObservableServer.java| 34
[cxf] 02/02: cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit df1c14e0f6d2246177c9f01762e19107e79c4393
Author: Alexey Markevich
AuthorDate: Fri Mar 12 17:59:55 2021 +0300
cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment
---
.../apache/cxf/endpoint/dynamic/DynamicClientFactory.java| 12 ++--
.../main/java/org/apache/cxf/frontend/ClientFactoryBean.java | 4 ++--
.../java/org/apache/cxf/frontend/ClientProxyFactoryBean.java | 3 +--
.../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 7 +++
.../org/apache/cxf/frontend/spring/ClientServerTest.java | 4 ++--
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 947e84a..2e8b416 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -392,7 +392,7 @@ public class DynamicClientFactory {
LOG.log(Level.SEVERE, new Message("COULD_NOT_COMPILE_SRC", LOG,
wsdlUrl).toString());
}
FileUtils.removeDir(src);
-URL[] urls = null;
+final URL[] urls;
try {
urls = new URL[] {classes.toURI().toURL()};
} catch (MalformedURLException mue) {
@@ -764,11 +764,11 @@ public class DynamicClientFactory {
errors.append('\n');
}
if (arg0.getLineNumber() > 0) {
-errors.append(arg0.getLocalizedMessage() + "\n"
-+ " at line " + arg0.getLineNumber()
-+ " column " + arg0.getColumnNumber()
-+ " of schema " + arg0.getSystemId()
-+ "\n");
+errors.append(arg0.getLocalizedMessage()).append('\n')
+.append(" at line ").append(arg0.getLineNumber())
+.append(" column ").append(arg0.getColumnNumber())
+.append(" of schema ").append(arg0.getSystemId())
+.append('\n');
} else {
errors.append(arg0.getMessage());
errors.append('\n');
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
index ae2dacb..4811727 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
@@ -85,8 +85,8 @@ public class ClientFactoryBean extends
AbstractWSDLBasedEndpointFactory {
} else if (properties != null) {
getServiceFactory().getProperties().putAll(properties);
}
-Client client = null;
-Endpoint ep = null;
+final Client client;
+final Endpoint ep;
try {
ep = createEndpoint();
this.getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_CLIENT_CREATE,
ep);
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
index d7b2977..a09a922 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
@@ -124,10 +124,9 @@ public class ClientProxyFactoryBean extends
AbstractBasicInterceptorProvider {
*/
public synchronized Object create() {
ClassLoaderHolder orig = null;
-ClassLoader loader = null;
try {
if (getBus() != null) {
-loader = getBus().getExtension(ClassLoader.class);
+ClassLoader loader = getBus().getExtension(ClassLoader.class);
if (loader != null) {
orig =
ClassLoaderUtils.setThreadContextClassloader(loader);
}
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 07f867d..958b118 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -243,10 +243,9 @@ public class WSDLGetUtils {
Message message,
String xsdWsdlPar) {
Bus bus = message.getExchange().getBus();
-List elementList = null;
try {
-elementList =
DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(),
+List
[cxf] branch master updated: cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new aec252e cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
aec252e is described below
commit aec252eda5197098f9306e62edbf6a46e35cd054
Author: Alexey Markevich
AuthorDate: Fri Mar 12 23:36:55 2021 +0300
cxf-rt-frontend-jaxws: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/jaxws/EndpointImpl.java| 4 +--
.../java/org/apache/cxf/jaxws/ServiceImpl.java | 11 +++
.../cxf/jaxws/context/WrappedMessageContext.java | 4 +--
.../handler/AnnotationHandlerChainBuilder.java | 4 +--
.../cxf/jaxws/handler/HandlerChainInvoker.java | 12 ++-
.../logical/LogicalHandlerOutInterceptor.java | 2 +-
.../jaxws/handler/logical/LogicalMessageImpl.java | 4 +--
.../jaxws/handler/soap/SOAPMessageContextImpl.java | 2 +-
.../interceptors/MessageModeOutInterceptor.java| 2 +-
.../cxf/jaxws/interceptors/SwAInInterceptor.java | 2 +-
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 2 +-
.../jaxws/interceptors/WebFaultOutInterceptor.java | 4 +--
.../interceptors/WrapperClassInInterceptor.java| 2 +-
.../interceptors/WrapperClassOutInterceptor.java | 2 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 13 ++--
.../JaxWsWebServicePublisherBeanPostProcessor.java | 4 +--
.../jaxws/support/JaxWsServiceConfiguration.java | 12 +++
.../cxf/jaxws/support/ServiceDelegateAccessor.java | 2 +-
.../java/org/apache/cxf/jaxws/CodeFirstTest.java | 3 +-
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 5 ++-
.../jaxws/WrapperNamespaceClassGeneratorTest.java | 10 ++
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 25 +++
.../handler/soap/SOAPHandlerInterceptorTest.java | 4 +--
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 2 ++
.../ExtSoapHeaderClientServerTest.java | 37 ++
25 files changed, 65 insertions(+), 109 deletions(-)
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index 307fb53..6ee698c 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -325,8 +325,6 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
checkPublishPermission();
checkPublishable();
-ServerImpl serv = null;
-
ClassLoaderHolder loader = null;
try {
if (bus != null) {
@@ -335,7 +333,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
loader =
ClassLoaderUtils.setThreadContextClassloader(newLoader);
}
}
-serv = getServer(addr);
+ServerImpl serv = getServer(addr);
if (addr != null) {
EndpointInfo endpointInfo =
serv.getEndpoint().getEndpointInfo();
if (endpointInfo.getAddress() == null ||
!endpointInfo.getAddress().contains(addr)) {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
index 85a0e77..186236a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
@@ -245,7 +245,7 @@ public class ServiceImpl extends ServiceDelegate {
private JaxWsClientEndpointImpl getJaxwsEndpoint(QName portName,
AbstractServiceFactoryBean sf,
WebServiceFeature...features) {
Service service = sf.getService();
-EndpointInfo ei = null;
+EndpointInfo ei;
if (portName == null) {
ei =
service.getServiceInfos().get(0).getEndpoints().iterator().next();
} else {
@@ -286,7 +286,7 @@ public class ServiceImpl extends ServiceDelegate {
private AbstractServiceFactoryBean createDispatchService(DataBinding db) {
AbstractServiceFactoryBean serviceFactory;
-Service dispatchService = null;
+final Service dispatchService;
if (null != wsdlURL) {
WSDLServiceFactory sf = new WSDLServiceFactory(bus, wsdlURL,
serviceName);
@@ -516,7 +516,6 @@ public class ServiceImpl extends ServiceDelegate {
private EndpointInfo createEndpointInfo(AbstractServiceFactoryBean
serviceFactory,
QName portName,
PortInfoImpl portInfo) throws
BusException {
-EndpointInfo ei = null;
String address = portInfo.getAddress();
String bindingID = BindingID.getBindingID(portInfo.getBindingID());
@@ -530,7 +529,7 @@ public class
buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/48345 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/48346 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[cxf-fediz] branch master updated: Updating Tomcat to 9.0.44
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git The following commit(s) were added to refs/heads/master by this push: new 1bb46f5 Updating Tomcat to 9.0.44 1bb46f5 is described below commit 1bb46f5a4182a74ecc235dd0fdf2c484a223022c Author: Colm O hEigeartaigh AuthorDate: Fri Mar 12 09:17:38 2021 + Updating Tomcat to 9.0.44 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90865ce..7a663ec 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 2.3.3.RELEASE 4.2.19.RELEASE 2.5.1.RELEASE -9.0.43 +9.0.44 2.0.2 2.2.6
[cxf] branch master updated: systests: fix compilation error; explicit stopAllServers
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new dfbc457 systests: fix compilation error; explicit stopAllServers
dfbc457 is described below
commit dfbc4575f45fb22d4a7417914f87ea585e64d6b1
Author: Alexey Markevich
AuthorDate: Fri Mar 12 12:08:07 2021 +0300
systests: fix compilation error; explicit stopAllServers
---
.../test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java | 2 +-
.../test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
index 4f7f4b3..d690315 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java
@@ -74,7 +74,7 @@ public class ReactorServer extends AbstractBusTestServerBase {
server2 = null;
}
-public static void main(String[] args) {
+public static void main(String[] args) throws Exception {
ReactorServer server = new ReactorServer();
System.out.println("Go to http://localhost:; + PORT +
"/reactor/flux/textJsonImplicitListAsyncStream");
server.start();
diff --git
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
index 2b3ee6b..ecbef8e 100644
---
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
+++
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
@@ -78,8 +78,9 @@ public class ClientServerSwaTest extends
AbstractBusClientServerTestBase {
createStaticBus();
}
@AfterClass
-public static void clearProperty() {
+public static void clearProperty() throws Exception {
System.clearProperty("EmbeddedBrokerURL");
+stopAllServers();
}
@Test
public void testSwa() throws Exception {
[cxf-fediz] branch 1.5.x-fixes updated: Updating Tomcat to 9.0.44
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 1.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git The following commit(s) were added to refs/heads/1.5.x-fixes by this push: new 118c860 Updating Tomcat to 9.0.44 118c860 is described below commit 118c860629f415c17966cc5be7325cca48a70e1d Author: Colm O hEigeartaigh AuthorDate: Fri Mar 12 09:17:38 2021 + Updating Tomcat to 9.0.44 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3eed784..748a40c 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 2.3.3.RELEASE 4.2.19.RELEASE 2.5.1.RELEASE -9.0.43 +9.0.44 2.0.2 2.2.6
[cxf] branch master updated: systests: fix compilation error; back System.exit(0)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 7cfda87 systests: fix compilation error; back System.exit(0)
7cfda87 is described below
commit 7cfda87f43d41fddb0e2d0e2501cb3918807e88f
Author: Alexey Markevich
AuthorDate: Fri Mar 12 13:54:08 2021 +0300
systests: fix compilation error; back System.exit(0)
---
.../description/SwaggerUiConfigurationTest.java| 35 +++---
.../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 5
.../ws/rm/AbstractClientPersistenceTest.java | 2 +-
.../ws/rm/AbstractServerPersistenceTest.java | 2 +-
.../cxf/systest/ws/rm/WSRM12ServerCycleTest.java | 2 +-
.../common/AbstractBusClientServerTestBase.java| 4 +--
.../testutil/common/AbstractTestServerBase.java| 2 ++
.../testutil/common/EmbeddedJMSBrokerLauncher.java | 4 +--
.../apache/cxf/testutil/common/ServerLauncher.java | 2 +-
9 files changed, 27 insertions(+), 31 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
index 9c25f3a..67ece33 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerUiConfigurationTest.java
@@ -31,11 +31,10 @@ import
org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
import org.apache.cxf.jaxrs.swagger.ui.SwaggerUiConfig;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractTestServerBase;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.containsString;
@@ -43,11 +42,13 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-public class SwaggerUiConfigurationTest extends
AbstractBusClientServerTestBase {
+public class SwaggerUiConfigurationTest extends AbstractClientServerTestBase {
private static final String PORT =
allocatePort(SwaggerUiConfigurationTest.class);
-@Ignore
-public static class Server extends AbstractBusTestServerBase {
+public static class Server extends AbstractTestServerBase {
+
+private org.apache.cxf.endpoint.Server server;
+
@Override
protected void run() {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
@@ -60,19 +61,18 @@ public class SwaggerUiConfigurationTest extends
AbstractBusClientServerTestBase
feature.setSwaggerUiConfig(new
SwaggerUiConfig().url("/swagger.json"));
sf.setFeatures(Arrays.asList(feature));
sf.setAddress("http://localhost:; + PORT + "/");
-sf.create();
+server = sf.create();
+}
+
+@Override
+public void tearDown() throws Exception {
+server.stop();
+server.destroy();
+server = null;
}
-public static void main(String[] args) {
-try {
-Server s = new Server();
-s.start();
-} catch (Exception ex) {
-ex.printStackTrace();
-System.exit(-1);
-} finally {
-System.out.println("done!");
-}
+public static void main(String[] args) throws Exception {
+new Server().start();
}
}
@@ -81,7 +81,6 @@ public class SwaggerUiConfigurationTest extends
AbstractBusClientServerTestBase
AbstractResourceInfo.clearAllMaps();
//keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
-createStaticBus();
}
@Test
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
index 0badeed..12b8d9d 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java
@@ -59,14 +59,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class JAXRSJmsTest extends AbstractBusClientServerTestBase {
-protected static boolean serversStarted;
[cxf] branch master updated: cxf-systests-ws-security: fix compilation error
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 3afa246 cxf-systests-ws-security: fix compilation error
3afa246 is described below
commit 3afa24650ef1988c8464b5a48853a6f75ff794f9
Author: Alexey Markevich
AuthorDate: Fri Mar 12 15:07:30 2021 +0300
cxf-systests-ws-security: fix compilation error
---
.../apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
index 831a7f1..d6073b2 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
@@ -33,25 +33,15 @@ public class JavaFirstPolicyServer extends
AbstractBusTestServerBase {
public static final String PORT2 =
allocatePort(JavaFirstPolicyServer.class, 2);
public static final String PORT3 =
allocatePort(JavaFirstPolicyServer.class, 3);
-public JavaFirstPolicyServer() {
-
-}
-
protected void run() {
URL busFile =
JavaFirstPolicyServer.class.getResource("javafirstserver.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
Assert.assertNotNull(busLocal);
setBus(busLocal);
-
-try {
-new JavaFirstPolicyServer();
-} catch (Exception e) {
-e.printStackTrace();
-}
}
-public static void main(String[] args) {
+public static void main(String[] args) throws Exception {
new JavaFirstPolicyServer().start();
}
}
[cxf] branch master updated: Fixing minor typo in comment
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new ed0c7fe Fixing minor typo in comment
ed0c7fe is described below
commit ed0c7fe5f6fa661662508dd0705e2965f6ef766e
Author: reta
AuthorDate: Fri Mar 12 07:48:34 2021 -0500
Fixing minor typo in comment
---
.../cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
index 8c39555..fa4d5ec 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
@@ -88,7 +88,7 @@ public class SpringJaxrsApplicationTest {
@Bean
public SpringBus cxf() {
final SpringBus bus = new SpringBus();
-// Bye default, the exception are propagated and out fault
interceptors are not called
+// By default, the exception are propagated and out fault
interceptors are not called
bus.setProperty("org.apache.cxf.propagate.exception",
Boolean.FALSE);
return bus;
}
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
index 338ec83..df9eb92 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
@@ -89,7 +89,7 @@ public class SpringJaxrsTest {
@Bean
public SpringBus cxf() {
final SpringBus bus = new SpringBus();
-// Bye default, the exception are propagated and out fault
interceptors are not called
+// By default, the exception are propagated and out fault
interceptors are not called
bus.setProperty("org.apache.cxf.propagate.exception",
Boolean.FALSE);
return bus;
}
[cxf] branch 3.4.x-fixes updated: Fixing minor typo in comment
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 1d6beaf Fixing minor typo in comment
1d6beaf is described below
commit 1d6beaff049e7c538d39c3da308559c2fefa3e60
Author: reta
AuthorDate: Fri Mar 12 07:48:34 2021 -0500
Fixing minor typo in comment
(cherry picked from commit ed0c7fe5f6fa661662508dd0705e2965f6ef766e)
---
.../cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
index 8c39555..fa4d5ec 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
@@ -88,7 +88,7 @@ public class SpringJaxrsApplicationTest {
@Bean
public SpringBus cxf() {
final SpringBus bus = new SpringBus();
-// Bye default, the exception are propagated and out fault
interceptors are not called
+// By default, the exception are propagated and out fault
interceptors are not called
bus.setProperty("org.apache.cxf.propagate.exception",
Boolean.FALSE);
return bus;
}
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
index 338ec83..df9eb92 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
@@ -89,7 +89,7 @@ public class SpringJaxrsTest {
@Bean
public SpringBus cxf() {
final SpringBus bus = new SpringBus();
-// Bye default, the exception are propagated and out fault
interceptors are not called
+// By default, the exception are propagated and out fault
interceptors are not called
bus.setProperty("org.apache.cxf.propagate.exception",
Boolean.FALSE);
return bus;
}
[cxf] branch 3.3.x-fixes updated (bea94da -> 45000ee)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from bea94da CXF-8424: Use template URL instead of actual path values for JAX-RS micrometer metrics (#758) new 306bcdf Fixing minor typo in comment new 45000ee Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + .../cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java | 2 +- .../java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
[cxf] 01/02: Fixing minor typo in comment
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 306bcdfb24c057949199950684c54e3e5e5665e7
Author: reta
AuthorDate: Fri Mar 12 07:48:34 2021 -0500
Fixing minor typo in comment
(cherry picked from commit ed0c7fe5f6fa661662508dd0705e2965f6ef766e)
---
.../cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
index 21ecafb..55d4ebc 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java
@@ -88,7 +88,7 @@ public class SpringJaxrsApplicationTest {
@Bean
public SpringBus cxf() {
final SpringBus bus = new SpringBus();
-// Bye default, the exception are propagated and out fault
interceptors are not called
+// By default, the exception are propagated and out fault
interceptors are not called
bus.setProperty("org.apache.cxf.propagate.exception",
Boolean.FALSE);
return bus;
}
diff --git
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
index 2b52d0c..c810c91 100644
---
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
+++
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
@@ -89,7 +89,7 @@ public class SpringJaxrsTest {
@Bean
public SpringBus cxf() {
final SpringBus bus = new SpringBus();
-// Bye default, the exception are propagated and out fault
interceptors are not called
+// By default, the exception are propagated and out fault
interceptors are not called
bus.setProperty("org.apache.cxf.propagate.exception",
Boolean.FALSE);
return bus;
}
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 45000eecaa20eaedf52c5cd75b922961aeed6018 Author: reta AuthorDate: Fri Mar 12 07:49:58 2021 -0500 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 86d8a66..1e72065 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -703,6 +703,7 @@ M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5 M e1237ab1f31b4b6bc601e93b8c0e4afec96668ee M e1b81269089d6e7cb53e949a9fde629d37bce421 M e2210a3520f39ba2262fa6934b26bd0cd8737e67 +M e36d407354defa65587a5e291f808bd65f4f43df M e38fc4aa14d7741369de5d027b30e52def3a0549 M e72ad770c9a8f4439b93e2c19e61c43562ac5877 M eb4bab9983a287bf9dc0574d22077cc783bc88ac
