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/31 11:31:32 UTC
[cxf] branch master updated: Removed a few redundant casts
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.git
The following commit(s) were added to refs/heads/master by this push:
new 754223f Removed a few redundant casts
754223f is described below
commit 754223f87930b2a98f80f0f4325069d8f67f3114
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 31 11:31:12 2018 +0000
Removed a few redundant casts
---
.../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java | 8 ++++----
.../src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 4 ++--
.../org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java | 2 +-
.../apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java | 2 +-
.../java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java | 7 +++----
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index cba8742..a729f25 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -307,7 +307,7 @@ public final class TLSParameterJaxBUtils {
return fac.getKeyManagers();
}
-
+
/**
* This method converts the JAXB KeyManagersType into a list of
* JSSE KeyManagers.
@@ -328,8 +328,8 @@ public final class TLSParameterJaxBUtils {
kmc.isSetProvider()
? KeyManagerFactory.getInstance(alg, kmc.getProvider())
: KeyManagerFactory.getInstance(alg);
-
- try {
+
+ try {
fac.init(keyStore, keyPass);
return fac.getKeyManagers();
@@ -396,7 +396,7 @@ public final class TLSParameterJaxBUtils {
? getKeyStore(tmc.getKeyStore(), true)
: (tmc.isSetCertStore()
? getKeyStore(tmc.getCertStore())
- : (KeyStore) null);
+ : null);
String alg = tmc.isSetFactoryAlgorithm()
? tmc.getFactoryAlgorithm()
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 3030423..7c2c11d 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -676,7 +676,7 @@ public final class JAXBEncoderDecoder {
public static void marshallNullElement(Marshaller marshaller,
Object source,
MessagePartInfo part) {
- Class<?> clazz = part != null ? (Class<?>)part.getTypeClass() : null;
+ Class<?> clazz = part != null ? part.getTypeClass() : null;
try {
writeObject(marshaller, source, newJAXBElement(part.getElementQName(), clazz, null));
} catch (JAXBException e) {
@@ -689,7 +689,7 @@ public final class JAXBEncoderDecoder {
Object source,
MessagePartInfo part,
boolean unwrap) {
- Class<?> clazz = part != null ? (Class<?>)part.getTypeClass() : null;
+ Class<?> clazz = part != null ? part.getTypeClass() : null;
if (clazz != null && Exception.class.isAssignableFrom(clazz) && part != null
&& Boolean.TRUE.equals(part.getProperty(JAXBDataBinding.class.getName() + ".CUSTOM_EXCEPTION"))) {
return unmarshallException(u, source, part);
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
index d523ffa..5643cd3 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
@@ -70,7 +70,7 @@ public class JsonMapObjectProvider implements MessageBodyReader<JsonMapObject>,
WebApplicationException {
String s = IOUtils.readStringFromStream(is);
try {
- JsonMapObject obj = cls == JsonMapObject.class ? new JsonMapObject() : (JsonMapObject)cls.newInstance();
+ JsonMapObject obj = cls == JsonMapObject.class ? new JsonMapObject() : cls.newInstance();
handler.fromJson(obj, s);
return obj;
} catch (Exception ex) {
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
index 25c9168..61a373f 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
@@ -196,7 +196,7 @@ public class AbstractAuthFilter {
protected AuthorizationPolicy getAuthorizationPolicy(String authorizationHeader) {
Message m = PhaseInterceptorChain.getCurrentMessage();
- return m != null ? (AuthorizationPolicy)m.get(AuthorizationPolicy.class) : null;
+ return m != null ? m.get(AuthorizationPolicy.class) : null;
}
protected boolean checkHttpVerb(HttpServletRequest req, List<String> verbs) {
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index e2bc912..f062fab 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -69,7 +69,6 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transport.Observable;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
@@ -434,7 +433,7 @@ public class MAPAggregatorImpl extends MAPAggregator {
}
AddressingProperties theMaps =
ContextUtils.retrieveMAPs(message, false, ContextUtils.isOutbound(message));
-
+
if (isAddressingRequired() && ContextUtils.isRequestor(message)) {
theMaps.setRequired(true);
}
@@ -582,7 +581,7 @@ public class MAPAggregatorImpl extends MAPAggregator {
passed = true;
} else if (WSAddressingFeature.AddressingResponses.NON_ANONYMOUS == addressingResponses
&& (!anonReply && (!anonFault && faultTo.getAddress() != null)
- || !anonReply && faultTo == null)) {
+ || !anonReply && faultTo == null)) {
passed = true;
}
if (!passed) {
@@ -987,7 +986,7 @@ public class MAPAggregatorImpl extends MAPAggregator {
destination = factory.getDestination(ei, bus);
Conduit conduit = ContextUtils.getConduit(null, message);
if (conduit != null) {
- MessageObserver ob = ((Observable)conduit).getMessageObserver();
+ MessageObserver ob = conduit.getMessageObserver();
ob = new InterposedMessageObserver(bus, ob);
destination.setMessageObserver(ob);
}