This is an automated email from the ASF dual-hosted git repository.
dkulp 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 efac0e6 Fix some eclipse warnings
efac0e6 is described below
commit efac0e68bcf6f515853d60011f5c9a102ae98dba
Author: Daniel Kulp <[email protected]>
AuthorDate: Tue Jul 9 10:40:24 2019 -0400
Fix some eclipse warnings
---
.../apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java | 3 ++-
.../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 2 ++
.../cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
index 11f610c..e50c88e 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
@@ -28,6 +28,7 @@ import org.apache.cxf.bus.spring.SpringBus;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.feature.Feature;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.springframework.beans.BeansException;
@@ -58,7 +59,7 @@ public abstract class AbstractSpringConfigurationFactory
factory.setOutFaultInterceptors(getOutFaultInterceptors());
factory.setFeatures(getFeatures());
if (!StringUtils.isEmpty(jaxrsExtensions)) {
-
factory.setExtensionMappings((Map)parseMapSequence(jaxrsExtensions));
+ factory.setExtensionMappings(CastUtils.cast((Map<?,
?>)parseMapSequence(jaxrsExtensions)));
}
finalizeFactorySetup(factory);
return factory.create();
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 565a8be..df3fe91 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -618,6 +618,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
}
}
+ @SuppressWarnings("deprecation")
private Connector createConnector(String hosto, int porto) {
// now we just use the SelectChannelConnector as the default connector
SslContextFactory sslcf = null;
@@ -758,6 +759,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
return context;
}
+ @SuppressWarnings("deprecation")
protected void setClientAuthentication(SslContextFactory con,
ClientAuthentication clientAuth) {
con.setWantClientAuth(true);
diff --git
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java
index a91411e..8f74d4d 100644
---
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java
+++
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java
@@ -233,6 +233,7 @@ public class JwsHTTPHeaderTest extends
AbstractBusClientServerTestBase {
WebClient.getConfig(client).getRequestContext().putAll(properties);
CustomHeaderInterceptor customHeaderInterceptor = new
CustomHeaderInterceptor(Phase.PRE_STREAM);
customHeaderInterceptor.setEmpty(true);
+ assertTrue(customHeaderInterceptor.isEmpty());
WebClient.getConfig(client).getOutInterceptors().add(customHeaderInterceptor);
Response response = client.post(new Book("book", 123L));