You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/05 17:18:58 UTC
[cxf] 09/12: Fix a bunch of compiler warnings
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b81199274d3e86a1ea5cfda443eefe9a8e60d0d5
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Aug 29 13:04:21 2018 -0400
Fix a bunch of compiler warnings
(cherry picked from commit b576c1072b77f2aaa0eca3aa6be80a3367b674c0)
---
.../apache/cxf/tracing/brave/AbstractBraveClientProvider.java | 2 --
.../org/apache/cxf/tracing/brave/AbstractBraveProvider.java | 2 --
.../apache/cxf/microprofile/client/MPRestClientCallback.java | 2 +-
.../jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java | 10 ----------
.../cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +-
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index 7bc4bcb..3fcb29e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -54,7 +54,6 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
final Request request = HttpAdapterFactory.request(requestHeaders, uri, method);
final HttpClientAdapter<Request, ?> adapter = HttpClientAdapterFactory.create(request);
- @SuppressWarnings("unchecked")
final HttpClientHandler<Request, ?> handler = HttpClientHandler.create(brave, adapter);
final Span span = handler.handleSend(
brave
@@ -102,7 +101,6 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
final Response response = HttpAdapterFactory.response(responseStatus);
final HttpClientAdapter<?, Response> adapter = HttpClientAdapterFactory.create(response);
- @SuppressWarnings("unchecked")
final HttpClientHandler<?, Response> handler = HttpClientHandler.create(brave, adapter);
handler.handleReceive(response, null, scope.getSpan());
} finally {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
index 043451b..d95db3e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
@@ -53,7 +53,6 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
final Request request = HttpAdapterFactory.request(requestHeaders, uri, method);
final HttpServerAdapter<Request, ?> adapter = HttpServerAdapterFactory.create(request);
- @SuppressWarnings("unchecked")
final HttpServerHandler<Request, ?> handler = HttpServerHandler.create(brave, adapter);
Span span = handler.handleReceive(
@@ -106,7 +105,6 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
final Response response = HttpAdapterFactory.response(responseStatus);
final HttpServerAdapter<?, Response> adapter = HttpServerAdapterFactory.create(response);
- @SuppressWarnings("unchecked")
final HttpServerHandler<?, Response> handler = HttpServerHandler.create(brave, adapter);
handler.handleSend(response, null, scope.getSpan());
} finally {
diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java
index a6863a3..a9c8857 100644
--- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java
+++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MPRestClientCallback.java
@@ -31,7 +31,7 @@ import javax.ws.rs.client.InvocationCallback;
import org.apache.cxf.jaxrs.client.JaxrsClientCallback;
-public class MPRestClientCallback<T> extends JaxrsClientCallback {
+public class MPRestClientCallback<T> extends JaxrsClientCallback<T> {
public MPRestClientCallback(InvocationCallback<T> handler,
Class<?> responseClass,
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
index d61cf4c..3899e77 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.systest.jaxrs.security.oauth2.common;
-import java.io.InputStream;
-import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -34,8 +32,6 @@ import org.apache.cxf.rs.security.oauth2.grants.code.JPACodeDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.saml.Constants;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.apache.cxf.rt.security.crypto.CryptoUtils;
-import org.apache.xml.security.utils.ClassLoaderUtils;
/**
* Extend the JPACodeDataProvider to allow refreshing of tokens
@@ -143,12 +139,6 @@ public class JPAOAuthDataProviderImpl extends JPACodeDataProvider {
}
- private Certificate loadCert() throws Exception {
- try (InputStream is = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) {
- return CryptoUtils.loadCertificate(is, "password".toCharArray(), "morpit", null);
- }
- }
-
@Override
public Client getClient(String clientId) {
Client c = super.getClient(clientId);
diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
index 799a134..8e31c50 100644
--- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
+++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
@@ -62,7 +62,7 @@ public abstract class AbstractTomcatServer extends AbstractBusTestServerBase {
cxfServlet.addInitParameter("jaxrs.serviceClasses", BookStore.class.getName());
cxfServlet.addInitParameter("jaxrs.providers", JacksonJsonProvider.class.getName());
cxfServlet.setAsyncSupported(true);
- context.addServletMapping("/rest/*", "cxfServlet");
+ context.addServletMappingDecoded("/rest/*", "cxfServlet");
} else {
server.getHost().setAppBase(base.getAbsolutePath());
server.getHost().setAutoDeploy(true);