You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/08 21:13:53 UTC
[4/8] cxf git commit: Bunch more warning fixes
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
index 77b2ee9..01a57b1 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
@@ -66,9 +66,8 @@ public class OidcRpAuthenticationService {
}
if (redirectUri != null) {
return Response.seeOther(redirectUri).build();
- } else {
- return Response.ok(oidcContext).build();
}
+ return Response.ok(oidcContext).build();
}
public void setDefaultLocation(String defaultLocation) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcUserInfoProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcUserInfoProvider.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcUserInfoProvider.java
index c553120..9077ef1 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcUserInfoProvider.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcUserInfoProvider.java
@@ -46,9 +46,8 @@ public class OidcUserInfoProvider implements ContextProvider<UserInfoContext> {
}
};
- } else {
- return null;
}
+ return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
index d91c58c..893295e 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/UserInfoClient.java
@@ -39,22 +39,19 @@ public class UserInfoClient extends OidcClaimsValidator {
if (getUserInfoFromJwt) {
String jwt = profileClient.get(String.class);
return getUserInfoFromJwt(jwt, idToken, client);
- } else {
- UserInfo profile = profileClient.get(UserInfo.class);
- validateUserInfo(profile, idToken, client);
- return profile;
- }
- } else {
- Form form = new Form().param("access_token", at.getTokenKey());
- if (getUserInfoFromJwt) {
- String jwt = profileClient.form(form).readEntity(String.class);
- return getUserInfoFromJwt(jwt, idToken, client);
- } else {
- UserInfo profile = profileClient.form(form).readEntity(UserInfo.class);
- validateUserInfo(profile, idToken, client);
- return profile;
}
+ UserInfo profile = profileClient.get(UserInfo.class);
+ validateUserInfo(profile, idToken, client);
+ return profile;
}
+ Form form = new Form().param("access_token", at.getTokenKey());
+ if (getUserInfoFromJwt) {
+ String jwt = profileClient.form(form).readEntity(String.class);
+ return getUserInfoFromJwt(jwt, idToken, client);
+ }
+ UserInfo profile = profileClient.form(form).readEntity(UserInfo.class);
+ validateUserInfo(profile, idToken, client);
+ return profile;
}
public UserInfo getUserInfoFromJwt(String profileJwtToken,
IdToken idToken,
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index f31c209..6da6f4c 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -36,8 +36,8 @@ import org.apache.cxf.rs.security.jose.jwt.JwtToken;
import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.common.OAuthRedirectionState;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
+import org.apache.cxf.rs.security.oidc.common.AbstractUserInfo;
import org.apache.cxf.rs.security.oidc.common.IdToken;
-import org.apache.cxf.rs.security.oidc.common.UserInfo;
import org.apache.cxf.rt.security.crypto.MessageDigestUtils;
public final class OidcUtils {
@@ -54,24 +54,24 @@ public final class OidcUtils {
public static final String EMAIL_SCOPE = "email";
public static final String ADDRESS_SCOPE = "address";
public static final String PHONE_SCOPE = "phone";
- public static final List<String> PROFILE_CLAIMS = Arrays.asList(UserInfo.NAME_CLAIM,
- UserInfo.FAMILY_NAME_CLAIM,
- UserInfo.GIVEN_NAME_CLAIM,
- UserInfo.MIDDLE_NAME_CLAIM,
- UserInfo.NICKNAME_CLAIM,
- UserInfo.PREFERRED_USERNAME_CLAIM,
- UserInfo.PROFILE_CLAIM,
- UserInfo.PICTURE_CLAIM,
- UserInfo.WEBSITE_CLAIM,
- UserInfo.GENDER_CLAIM,
- UserInfo.BIRTHDATE_CLAIM,
- UserInfo.ZONEINFO_CLAIM,
- UserInfo.LOCALE_CLAIM,
- UserInfo.UPDATED_AT_CLAIM);
- public static final List<String> EMAIL_CLAIMS = Arrays.asList(UserInfo.EMAIL_CLAIM,
- UserInfo.EMAIL_VERIFIED_CLAIM);
- public static final List<String> ADDRESS_CLAIMS = Arrays.asList(UserInfo.ADDRESS_CLAIM);
- public static final List<String> PHONE_CLAIMS = Arrays.asList(UserInfo.PHONE_CLAIM);
+ public static final List<String> PROFILE_CLAIMS = Arrays.asList(AbstractUserInfo.NAME_CLAIM,
+ AbstractUserInfo.FAMILY_NAME_CLAIM,
+ AbstractUserInfo.GIVEN_NAME_CLAIM,
+ AbstractUserInfo.MIDDLE_NAME_CLAIM,
+ AbstractUserInfo.NICKNAME_CLAIM,
+ AbstractUserInfo.PREFERRED_USERNAME_CLAIM,
+ AbstractUserInfo.PROFILE_CLAIM,
+ AbstractUserInfo.PICTURE_CLAIM,
+ AbstractUserInfo.WEBSITE_CLAIM,
+ AbstractUserInfo.GENDER_CLAIM,
+ AbstractUserInfo.BIRTHDATE_CLAIM,
+ AbstractUserInfo.ZONEINFO_CLAIM,
+ AbstractUserInfo.LOCALE_CLAIM,
+ AbstractUserInfo.UPDATED_AT_CLAIM);
+ public static final List<String> EMAIL_CLAIMS = Arrays.asList(AbstractUserInfo.EMAIL_CLAIM,
+ AbstractUserInfo.EMAIL_VERIFIED_CLAIM);
+ public static final List<String> ADDRESS_CLAIMS = Arrays.asList(AbstractUserInfo.ADDRESS_CLAIM);
+ public static final List<String> PHONE_CLAIMS = Arrays.asList(AbstractUserInfo.PHONE_CLAIM);
public static final String CLAIMS_PARAM = "claims";
public static final String CLAIM_NAMES_PROPERTY = "_claim_names";
public static final String CLAIM_SOURCES_PROPERTY = "_claim_sources";
@@ -100,9 +100,8 @@ public final class OidcUtils {
String prompt = params.getFirst(PROMPT_PARAMETER);
if (prompt != null) {
return Arrays.asList(prompt.trim().split(" "));
- } else {
- return Collections.emptyList();
}
+ return Collections.emptyList();
}
public static String getOpenIdScope() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
index e4d81bb..6f07a0e 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
@@ -225,9 +225,8 @@ public class AbstractSSOSpHandler {
protected String getIssuerId(Message m) {
if (issuerId == null) {
return new UriInfoImpl(m).getBaseUri().toString();
- } else {
- return issuerId;
}
+ return issuerId;
}
public boolean isSupportUnsolicited() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index 76529e5..09b5d41 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -269,9 +269,8 @@ public abstract class AbstractServiceProviderFilter extends AbstractSSOSpHandler
.path(assertionConsumerServiceAddress)
.build()
.toString();
- } else {
- return assertionConsumerServiceAddress;
}
+ return assertionConsumerServiceAddress;
}
protected void reportError(String code) {
@@ -292,13 +291,11 @@ public abstract class AbstractServiceProviderFilter extends AbstractSSOSpHandler
if (addWebAppContext) {
if (addEndpointAddressToContext) {
return new UriInfoImpl(m).getBaseUri().getRawPath();
- } else {
- String httpBasePath = (String)m.get("http.base.path");
- return URI.create(httpBasePath).getRawPath();
}
- } else {
- return "/";
+ String httpBasePath = (String)m.get("http.base.path");
+ return URI.create(httpBasePath).getRawPath();
}
+ return "/";
}
public String getWebAppDomain() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
index aebd603..7d10217 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
@@ -96,12 +96,11 @@ public class MetadataService extends AbstractSSOSpHandler {
rawPath + logoutServiceAddress,
privateKey, issuerCerts[0],
true);
- } else {
- return metadataWriter.getMetaData(serviceAddress, assertionConsumerServiceAddress,
- logoutServiceAddress,
- privateKey, issuerCerts[0],
- true);
}
+ return metadataWriter.getMetaData(serviceAddress, assertionConsumerServiceAddress,
+ logoutServiceAddress,
+ privateKey, issuerCerts[0],
+ true);
} catch (Exception ex) {
LOG.log(Level.FINE, ex.getMessage(), ex);
throw ExceptionUtils.toInternalServerErrorException(ex, null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
index 0d7a1b6..9ec7fc6 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
@@ -61,32 +61,31 @@ public class SamlPostBindingFilter extends AbstractServiceProviderFilter {
Message m = JAXRSUtils.getCurrentMessage();
if (checkSecurityContext(m)) {
return;
- } else {
- try {
- SamlRequestInfo info = createSamlRequestInfo(m);
- info.setIdpServiceAddress(getIdpServiceAddress());
- // This depends on RequestDispatcherProvider linking
- // SamlRequestInfo with the jsp page which will fill
- // in the XHTML form using SamlRequestInfo
- // in principle we could've built the XHTML form right here
- // but it will be cleaner to get that done in JSP
-
- String contextCookie = createCookie(SSOConstants.RELAY_STATE,
- info.getRelayState(),
- info.getWebAppContext(),
- info.getWebAppDomain());
- new MessageContextImpl(m).getHttpServletResponse().addHeader(
- HttpHeaders.SET_COOKIE, contextCookie);
-
- context.abortWith(Response.ok(info)
- .type("text/html")
- .header(HttpHeaders.CACHE_CONTROL, "no-cache, no-store")
- .header("Pragma", "no-cache")
- .build());
-
- } catch (Exception ex) {
- throw ExceptionUtils.toInternalServerErrorException(ex, null);
- }
+ }
+ try {
+ SamlRequestInfo info = createSamlRequestInfo(m);
+ info.setIdpServiceAddress(getIdpServiceAddress());
+ // This depends on RequestDispatcherProvider linking
+ // SamlRequestInfo with the jsp page which will fill
+ // in the XHTML form using SamlRequestInfo
+ // in principle we could've built the XHTML form right here
+ // but it will be cleaner to get that done in JSP
+
+ String contextCookie = createCookie(SSOConstants.RELAY_STATE,
+ info.getRelayState(),
+ info.getWebAppContext(),
+ info.getWebAppDomain());
+ new MessageContextImpl(m).getHttpServletResponse().addHeader(
+ HttpHeaders.SET_COOKIE, contextCookie);
+
+ context.abortWith(Response.ok(info)
+ .type("text/html")
+ .header(HttpHeaders.CACHE_CONTROL, "no-cache, no-store")
+ .header("Pragma", "no-cache")
+ .build());
+
+ } catch (Exception ex) {
+ throw ExceptionUtils.toInternalServerErrorException(ex, null);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
index 8a7b725..0ecc9f8 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
@@ -52,34 +52,33 @@ public class SamlRedirectBindingFilter extends AbstractServiceProviderFilter {
Message m = JAXRSUtils.getCurrentMessage();
if (checkSecurityContext(m)) {
return;
- } else {
- try {
- SamlRequestInfo info = createSamlRequestInfo(m);
- String urlEncodedRequest =
- URLEncoder.encode(info.getSamlRequest(), StandardCharsets.UTF_8.name());
-
- UriBuilder ub = UriBuilder.fromUri(getIdpServiceAddress());
-
- ub.queryParam(SSOConstants.SAML_REQUEST, urlEncodedRequest);
- ub.queryParam(SSOConstants.RELAY_STATE, info.getRelayState());
- if (isSignRequest()) {
- signRequest(urlEncodedRequest, info.getRelayState(), ub);
- }
-
- String contextCookie = createCookie(SSOConstants.RELAY_STATE,
- info.getRelayState(),
- info.getWebAppContext(),
- info.getWebAppDomain());
-
- context.abortWith(Response.seeOther(ub.build())
- .header(HttpHeaders.CACHE_CONTROL, "no-cache, no-store")
- .header("Pragma", "no-cache")
- .header(HttpHeaders.SET_COOKIE, contextCookie)
- .build());
- } catch (Exception ex) {
- LOG.log(Level.FINE, ex.getMessage(), ex);
- throw ExceptionUtils.toInternalServerErrorException(ex, null);
+ }
+ try {
+ SamlRequestInfo info = createSamlRequestInfo(m);
+ String urlEncodedRequest =
+ URLEncoder.encode(info.getSamlRequest(), StandardCharsets.UTF_8.name());
+
+ UriBuilder ub = UriBuilder.fromUri(getIdpServiceAddress());
+
+ ub.queryParam(SSOConstants.SAML_REQUEST, urlEncodedRequest);
+ ub.queryParam(SSOConstants.RELAY_STATE, info.getRelayState());
+ if (isSignRequest()) {
+ signRequest(urlEncodedRequest, info.getRelayState(), ub);
}
+
+ String contextCookie = createCookie(SSOConstants.RELAY_STATE,
+ info.getRelayState(),
+ info.getWebAppContext(),
+ info.getWebAppDomain());
+
+ context.abortWith(Response.seeOther(ub.build())
+ .header(HttpHeaders.CACHE_CONTROL, "no-cache, no-store")
+ .header("Pragma", "no-cache")
+ .header(HttpHeaders.SET_COOKIE, contextCookie)
+ .build());
+ } catch (Exception ex) {
+ LOG.log(Level.FINE, ex.getMessage(), ex);
+ throw ExceptionUtils.toInternalServerErrorException(ex, null);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
index 6557a87..6640156 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
@@ -43,9 +43,8 @@ public class CryptoLoader {
org.apache.cxf.rt.security.utils.SecurityUtils.loadResource(cryptoResource);
if (url != null) {
return loadCryptoFromURL(url);
- } else {
- return null;
}
+ return null;
}
public Crypto getCrypto(Message message,
@@ -106,8 +105,7 @@ public class CryptoLoader {
}
return o;
}
- } else {
- return null;
}
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedOutInterceptor.java
index 6a683d0..d45dff6 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlEnvelopedOutInterceptor.java
@@ -102,9 +102,8 @@ public class SamlEnvelopedOutInterceptor extends AbstractXmlSecOutInterceptor {
CachedOutputStream bos = new CachedOutputStream();
StaxUtils.writeTo(newDoc, bos);
return StaxUtils.read(bos.getInputStream());
- } else {
- return newDoc;
}
+ return newDoc;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
index 3ae5e02..182f097 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
@@ -73,11 +73,10 @@ public abstract class AbstractXmlSecInHandler {
protected Document getDocument(Message message) {
if (isServerGet(message)) {
return null;
- } else {
- Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
- if (responseCode != null && responseCode != 200) {
- return null;
- }
+ }
+ Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
+ if (responseCode != null && responseCode != 200) {
+ return null;
}
Document doc = null;
InputStream is = message.getContent(InputStream.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
index 4e3e26b..1c47c84 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
@@ -91,9 +91,8 @@ public abstract class AbstractXmlSecOutInterceptor extends AbstractPhaseIntercep
MessageContentsList objs = MessageContentsList.getContentsList(message);
if (objs == null || objs.size() == 0) {
return null;
- } else {
- return objs.get(0);
}
+ return objs.get(0);
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
index 4a89f8e..c65798d 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
@@ -190,9 +190,8 @@ public class AbstractXmlSigInHandler extends AbstractXmlSecInHandler {
SecurityContext sc = message.get(SecurityContext.class);
if (sc != null && sc.getUserPrincipal() != null) {
return sc.getUserPrincipal().getName();
- } else {
- return RSSecurityUtils.getUserName(crypto, null);
}
+ return RSSecurityUtils.getUserName(crypto, null);
}
@@ -297,9 +296,8 @@ public class AbstractXmlSigInHandler extends AbstractXmlSecInHandler {
if (!expectedID.equals(rootId)) {
return XMLUtils.findElementById(root, expectedID, true);
- } else {
- return root;
}
+ return root;
}
public void setSignatureProperties(SignatureProperties properties) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
index e5e45be..fc5c087 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
@@ -147,11 +147,10 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message> imple
private boolean canDocumentBeRead(Message message) {
if (isServerGet(message)) {
return false;
- } else {
- Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
- if (responseCode != null && responseCode != 200) {
- return false;
- }
+ }
+ Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
+ if (responseCode != null && responseCode != 200) {
+ return false;
}
return true;
}
@@ -460,13 +459,12 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message> imple
if (!canDocumentBeRead(message)) {
return ctx.proceed();
- } else {
- prepareMessage(message);
- Object object = ctx.proceed();
- new StaxActionInInterceptor(requireSignature,
- requireEncryption).handleMessage(message);
- return object;
}
+ prepareMessage(message);
+ Object object = ctx.proceed();
+ new StaxActionInInterceptor(requireSignature,
+ requireEncryption).handleMessage(message);
+ return object;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptor.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptor.java
index 9b0b0f6..f19471a 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptor.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptor.java
@@ -118,27 +118,25 @@ public class ClaimsAuthorizingInterceptor extends AbstractPhaseInterceptor<Messa
if (matchingClaim == null) {
if (claimBean.getClaimMode() == ClaimMode.STRICT) {
return false;
- } else {
- continue;
}
+ continue;
}
List<Object> claimValues = claim.getValues();
List<Object> matchingClaimValues = matchingClaim.getValues();
if (claimBean.isMatchAll()
&& !matchingClaimValues.containsAll(claimValues)) {
return false;
- } else {
- boolean matched = false;
- for (Object value : matchingClaimValues) {
- if (claimValues.contains(value)) {
- matched = true;
- break;
- }
- }
- if (!matched) {
- return false;
+ }
+ boolean matched = false;
+ for (Object value : matchingClaimValues) {
+ if (claimValues.contains(value)) {
+ matched = true;
+ break;
}
}
+ if (!matched) {
+ return false;
+ }
}
return true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
----------------------------------------------------------------------
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
index b3ccbfd..e41cb80 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
@@ -139,9 +139,8 @@ public abstract class WSS4JBasicAuthValidator {
context.setIssuer(SAMLUtils.getIssuer(samlAssertion));
context.setAssertionElement(SAMLUtils.getAssertionElement(samlAssertion));
return context;
- } else {
- return createSecurityContext(credential.getPrincipal());
}
+ return createSecurityContext(credential.getPrincipal());
}
public Validator getValidator() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
index 051e9a1..47957ba 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
@@ -224,9 +224,8 @@ public class Servlet3ContinuationProvider implements ContinuationProvider {
String exName = (String)inMessage.getContextualProperty("disconnected.client.exception.class");
if (exName != null) {
return exName.equals(IOException.class.getName()) || exName.equals(ex.getClass().getName());
- } else {
- return false;
}
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
index 46f94f7..e0f2f4d 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
@@ -397,9 +397,8 @@ public class URLConnectionHTTPConduit extends HTTPConduit {
//reason phrase in response, return a informative value
//to tell user no reason phrase in the response instead of null
return "no reason phrase in the response";
- } else {
- return connection.getResponseMessage();
}
+ return connection.getResponseMessage();
}
protected InputStream getPartialResponse() throws IOException {
return ChunkedUtil.getPartialResponse(connection, connection.getResponseCode());
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
index bb5abaf..cc8b4a0 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
@@ -213,9 +213,8 @@ public abstract class AbstractSpnegoAuthSupplier {
public CallbackHandler getUsernamePasswordHandler(final String username, final String password) {
if (StringUtils.isEmpty(username)) {
return null;
- } else {
- return new NamePasswordCallbackHandler(username, password);
}
+ return new NamePasswordCallbackHandler(username, password);
}
public void setCredDelegation(boolean delegation) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplier.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplier.java
index 3807908..071e129 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplier.java
@@ -56,9 +56,8 @@ public final class DefaultBasicAuthSupplier implements HttpAuthSupplier {
return getBasicAuthHeader(authPolicy.getUserName(),
authPolicy.getPassword(),
encodeBasicAuthWithIso8859);
- } else {
- return null;
}
+ return null;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
index 9d3d1a3..c38d216 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
@@ -77,9 +77,8 @@ public class DigestAuthSupplier implements HttpAuthSupplier {
return di.generateAuth(getAuthURI(currentURI),
authPolicy.getUserName(),
authPolicy.getPassword());
- } else {
- return null;
}
+ return null;
}
HttpAuthHeader authHeader = new HttpAuthHeader(fullHeader);
if (authHeader.authTypeIsDigest()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/WSDLGetAuthenticatorInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/WSDLGetAuthenticatorInterceptor.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/WSDLGetAuthenticatorInterceptor.java
index 80a6e4e..eb7a4ae 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/WSDLGetAuthenticatorInterceptor.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/WSDLGetAuthenticatorInterceptor.java
@@ -72,12 +72,11 @@ public class WSDLGetAuthenticatorInterceptor extends AbstractPhaseInterceptor<Me
if (policy == null) {
handle401response(message, endpoint);
return;
- } else {
- Subject subject = (Subject)authenticate(policy.getUserName(), policy.getPassword());
- if (subject == null) {
- handle401response(message, endpoint);
- return;
- }
+ }
+ Subject subject = (Subject)authenticate(policy.getUserName(), policy.getPassword());
+ if (subject == null) {
+ handle401response(message, endpoint);
+ return;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraintsInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraintsInterceptor.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraintsInterceptor.java
index 3200989..ce93aa9 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraintsInterceptor.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraintsInterceptor.java
@@ -76,13 +76,12 @@ public final class CertConstraintsInterceptor extends AbstractPhaseInterceptor<M
throw new UntrustedURLConnectionIOException(
"No client certificates were found"
);
- } else {
- X509Certificate[] x509Certs = (X509Certificate[])certs;
- if (!certConstraints.matches(x509Certs[0])) {
- throw new UntrustedURLConnectionIOException(
- "The client certificate does not match the defined cert constraints"
- );
- }
+ }
+ X509Certificate[] x509Certs = (X509Certificate[])certs;
+ if (!certConstraints.matches(x509Certs[0])) {
+ throw new UntrustedURLConnectionIOException(
+ "The client certificate does not match the defined cert constraints"
+ );
}
} catch (UntrustedURLConnectionIOException ex) {
throw new Fault(ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
index 7e84cba..67ecb30 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsMessageTrustDecider.java
@@ -49,13 +49,12 @@ final class HttpsMessageTrustDecider extends MessageTrustDecider {
throw new UntrustedURLConnectionIOException(
"No server certificates were found"
);
- } else {
- X509Certificate[] certs = (X509Certificate[])info.getServerCertificates();
- if (!certConstraints.matches(certs[0])) {
- throw new UntrustedURLConnectionIOException(
- "The server certificate(s) do not match the defined cert constraints"
- );
- }
+ }
+ X509Certificate[] certs = (X509Certificate[])info.getServerCertificates();
+ if (!certConstraints.matches(certs[0])) {
+ throw new UntrustedURLConnectionIOException(
+ "The server certificate(s) do not match the defined cert constraints"
+ );
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
index a7ee1a8..e35518c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
@@ -97,9 +97,8 @@ public final class PublicSuffixMatcher {
final DomainType domainType = map.get(rule);
if (domainType == null) {
return false;
- } else {
- return expectedType == null || domainType.equals(expectedType);
}
+ return expectedType == null || domainType.equals(expectedType);
}
private boolean hasRule(final String rule, final DomainType expectedType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 55d330a..47ebb9f 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -185,9 +185,8 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
}
}
return list;
- } else {
- return null;
}
+ return null;
}
protected static Map<String, String> parseMapSequence(String sequence) {
@@ -208,9 +207,8 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
}
}
return map;
- } else {
- return Collections.emptyMap();
}
+ return Collections.emptyMap();
}
protected void doPost(HttpServletRequest request, HttpServletResponse response)
@@ -470,9 +468,8 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
public boolean isSecure() {
if (originalProto != null) {
return "https".equals(originalProto);
- } else {
- return super.isSecure();
}
+ return super.isSecure();
}
@Override
public StringBuffer getRequestURL() {
@@ -490,9 +487,8 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
public String getRemoteAddr() {
if (originalClientIp != null) {
return originalClientIp;
- } else {
- return super.getRemoteAddr();
}
+ return super.getRemoteAddr();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
index 65a0a44..5f09569 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
@@ -138,16 +138,14 @@ public class FormattedServiceListWriter implements ServiceListWriter {
if (endpointAddress.startsWith("http://") || endpointAddress.startsWith("https://")) {
if (endpointAddress.startsWith(basePath) || showForeignContexts) {
return endpointAddress;
- } else {
- return null;
}
- } else {
- String address = basePath;
- if (address.endsWith("/") && endpointAddress.startsWith("/")) {
- address = address.substring(0, address.length() - 1);
- }
- return address + endpointAddress;
+ return null;
+ }
+ String address = basePath;
+ if (address.endsWith("/") && endpointAddress.startsWith("/")) {
+ address = address.substring(0, address.length() - 1);
}
+ return address + endpointAddress;
}
private void writeRESTfulEndpoints(PrintWriter writer,
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index 3362c35..dd71b41 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -271,9 +271,8 @@ public class JMSDestination extends AbstractMultiplexDestination implements Mess
if (ex != null) {
if (ex.getCause() instanceof RuntimeException) {
throw (RuntimeException)ex.getCause();
- } else {
- throw new RuntimeException(ex);
}
+ throw new RuntimeException(ex);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
index 26fea0d..22ff7e6 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
@@ -109,8 +109,7 @@ public final class JMSFactory {
workQueue.execute(command, 0);
}
};
- } else {
- return Executors.newFixedThreadPool(20);
}
+ return Executors.newFixedThreadPool(20);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
index 60dfb87..faef2e2 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
@@ -69,9 +69,8 @@ final class JMSURIParser {
String found = uri.substring(pos, separatorPos);
pos = separatorPos + 1;
return found;
- } else {
- return null;
}
+ return null;
}
public Map<String, Object> parseQuery() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSDestinationResolver.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSDestinationResolver.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSDestinationResolver.java
index d8e84b4..b385860 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSDestinationResolver.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSDestinationResolver.java
@@ -37,9 +37,8 @@ public class JMSDestinationResolver implements DestinationResolver {
}
if (pubSubDomain) {
return session.createTopic(destinationName);
- } else {
- return session.createQueue(destinationName);
}
+ return session.createQueue(destinationName);
}
public void setJndiTemplate(JndiHelper jt) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index 461a2b1..a32c8a5 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -140,9 +140,8 @@ public class PollingMessageListenerContainer extends AbstractMessageListenerCont
if (durableSubscriptionName != null && destination instanceof Topic) {
return session.createDurableSubscriber((Topic)destination, durableSubscriptionName,
messageSelector, pubSubNoLocal);
- } else {
- return session.createConsumer(destination, messageSelector);
}
+ return session.createConsumer(destination, messageSelector);
}
protected void handleException(Exception e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 1f4a8cf..ab2256c 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -441,9 +441,8 @@ public class JMSDestinationTest extends AbstractJMSTester {
private String getDestinationName(Destination dest) throws JMSException {
if (dest instanceof Queue) {
return ((Queue)dest).getQueueName();
- } else {
- return ((Topic)dest).getTopicName();
}
+ return ((Topic)dest).getTopicName();
}
protected void verifyReplyToSet(Message cxfMsg,
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
index 15b5165..3a3ef72 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
@@ -39,9 +39,8 @@ public class MyBeanLocator implements ConfiguredBeanLocator {
public <T> T getBeanOfType(String name, Class<T> type) {
if (registry.containsKey(name)) {
return (T)registry.get(name);
- } else {
- return cbl.getBeanOfType(name, type);
}
+ return cbl.getBeanOfType(name, type);
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
index 40fd02e..83d8a18 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java
@@ -103,38 +103,35 @@ public class WebSocketDestinationFactory implements HttpDestinationFactory {
registry, endpointInfo, undertowServerEngineFactory);
}
return null;
- } else {
- if (JETTY_AVAILABLE) {
- // for the embedded mode, we stick to jetty if jetty is available
- JettyHTTPServerEngineFactory serverEngineFactory = bus
- .getExtension(JettyHTTPServerEngineFactory.class);
- return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR, bus, registry,
- endpointInfo, serverEngineFactory);
- } else if (UNDERTOW_AVAILABLE) {
- // use UndertowWebSocketDestination
- UndertowHTTPServerEngineFactory undertowServerEngineFactory = bus
- .getExtension(UndertowHTTPServerEngineFactory.class);
- return createUndertowHTTPDestination(UNDERTOW_WEBSOCKET_DESTINATION_CTR, bus,
- registry, endpointInfo, undertowServerEngineFactory);
- }
- return null;
}
- } else {
- // REVISIT other way of getting the registry of http so that the plain cxf servlet finds the
- // destination?
- registry = getDestinationRegistry(bus);
-
- // choose atmosphere if available, otherwise assume jetty is available
- if (ATMOSPHERE_AVAILABLE && !atmosphereDisabled) {
- // use atmosphere if available
- return new AtmosphereWebSocketServletDestination(bus, registry, endpointInfo,
- endpointInfo.getAddress());
- } else {
- // use jetty-websocket
+ if (JETTY_AVAILABLE) {
+ // for the embedded mode, we stick to jetty if jetty is available
+ JettyHTTPServerEngineFactory serverEngineFactory = bus
+ .getExtension(JettyHTTPServerEngineFactory.class);
return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR, bus, registry,
- endpointInfo, null);
+ endpointInfo, serverEngineFactory);
+ } else if (UNDERTOW_AVAILABLE) {
+ // use UndertowWebSocketDestination
+ UndertowHTTPServerEngineFactory undertowServerEngineFactory = bus
+ .getExtension(UndertowHTTPServerEngineFactory.class);
+ return createUndertowHTTPDestination(UNDERTOW_WEBSOCKET_DESTINATION_CTR, bus,
+ registry, endpointInfo, undertowServerEngineFactory);
}
+ return null;
+ }
+ // REVISIT other way of getting the registry of http so that the plain cxf servlet finds the
+ // destination?
+ registry = getDestinationRegistry(bus);
+
+ // choose atmosphere if available, otherwise assume jetty is available
+ if (ATMOSPHERE_AVAILABLE && !atmosphereDisabled) {
+ // use atmosphere if available
+ return new AtmosphereWebSocketServletDestination(bus, registry, endpointInfo,
+ endpointInfo.getAddress());
}
+ // use jetty-websocket
+ return createJettyHTTPDestination(JETTY9_WEBSOCKET_DESTINATION_CTR, bus, registry,
+ endpointInfo, null);
}
private static DestinationRegistry getDestinationRegistry(Bus bus) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index c1b22ba..2e582b8 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -381,9 +381,8 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
if (first && isStatusCode(line)) {
statusCode = Integer.parseInt(line);
continue;
- } else {
- first = false;
}
+ first = false;
int del = line.indexOf(':');
String h = line.substring(0, del).trim();
String v = line.substring(del + 1).trim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index 32a591f..3037524 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -135,9 +135,8 @@ public class AtmosphereWebSocketJettyDestination extends JettyHTTPDestination im
throw new IOException(e);
}
return;
- } else {
- super.handle(target, baseRequest, request, response);
}
+ super.handle(target, baseRequest, request, response);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index de10c1c..3c6ffff 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -343,9 +343,8 @@ public class DefaultProtocolInterceptor extends AtmosphereInterceptorAdapter {
if (request.attributes().get(RESPONSE_PARENT) == null) {
request.attributes().put(RESPONSE_PARENT, "true");
return createResponse(response, responseDraft, true);
- } else {
- return createResponse(response, responseDraft, false);
}
+ return createResponse(response, responseDraft, false);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
index 27aa6d2..5a2745c 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
@@ -439,9 +439,8 @@ public class WebSocketUndertowServletRequest implements HttpServletRequest {
// our protocol assumes no multiple headers
if (requestHeaders.get(name) != null) {
return Collections.enumeration(Arrays.asList(requestHeaders.get(name)));
- } else {
- return Collections.enumeration(Arrays.asList());
}
+ return Collections.enumeration(Arrays.asList());
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
index a0454a4..77d36f7 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
@@ -226,9 +226,8 @@ final class InternalContextUtils {
&& partialResponse.getContent(Exception.class) != null) {
if (partialResponse.getContent(Exception.class) instanceof Fault) {
throw (Fault)partialResponse.getContent(Exception.class);
- } else {
- throw new Fault(partialResponse.getContent(Exception.class));
}
+ throw new Fault(partialResponse.getContent(Exception.class));
}
return;
}
@@ -281,9 +280,8 @@ final class InternalContextUtils {
&& partialResponse.getContent(Exception.class) != null) {
if (partialResponse.getContent(Exception.class) instanceof Fault) {
throw (Fault)partialResponse.getContent(Exception.class);
- } else {
- throw new Fault(partialResponse.getContent(Exception.class));
}
+ throw new Fault(partialResponse.getContent(Exception.class));
}
if (chain != null) {
chain.reset();
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
index 0b49bd1..7dd38ce 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
@@ -109,10 +109,9 @@ public class AssertionBuilderRegistryImpl extends AssertionBuilderFactoryImpl im
LOG.warning(m.toString());
}
return new XMLPrimitiveAssertionBuilder();
- } else {
- Message m = new Message("NO_ASSERTIONBUILDER_EXC", BUNDLE, qname.toString());
- throw new PolicyException(m);
}
+ Message m = new Message("NO_ASSERTIONBUILDER_EXC", BUNDLE, qname.toString());
+ throw new PolicyException(m);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
index 06b1363..9648669 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
@@ -197,9 +197,8 @@ public class EffectivePolicyImpl implements EffectivePolicy {
if (null == alternative) {
PolicyUtils.logPolicy(LOG, Level.FINE, "No alternative supported.", getPolicy());
throw new PolicyException(new org.apache.cxf.common.i18n.Message("NO_ALTERNATIVE_EXC", BUNDLE));
- } else {
- setChosenAlternative(alternative);
}
+ setChosenAlternative(alternative);
}
void initialiseInterceptors(PolicyEngine engine, Message m) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
index 4b2144d..9700a2a 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
@@ -170,9 +170,8 @@ public class EndpointPolicyImpl implements EndpointPolicy {
}
if (null == alternative) {
throw new PolicyException(new org.apache.cxf.common.i18n.Message("NO_ALTERNATIVE_EXC", BUNDLE));
- } else {
- setChosenAlternative(alternative);
}
+ setChosenAlternative(alternative);
}
protected Collection<Assertion> getSupportedAlternatives(Message msg) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
index 11e13f5..093c8d9 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
@@ -450,9 +450,8 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
private Element loadPolicy(String uri, String defName) {
if (!uri.startsWith("#")) {
return loadRemotePolicy(uri, defName);
- } else {
- return loadLocalPolicy(uri);
}
+ return loadLocalPolicy(uri);
}
private Element loadRemotePolicy(String uri, String defName) {
@@ -492,8 +491,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
.getBeanOfType(uri.substring(1), PolicyBean.class);
if (null != pb) {
return pb.getElement();
- } else {
- return null;
}
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/reference/RemoteReferenceResolver.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/reference/RemoteReferenceResolver.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/reference/RemoteReferenceResolver.java
index 3387cfc..5e2a797 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/reference/RemoteReferenceResolver.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/reference/RemoteReferenceResolver.java
@@ -63,16 +63,15 @@ public class RemoteReferenceResolver implements ReferenceResolver {
}
if (pos == -1) {
return builder.getPolicy(doc.getDocumentElement());
- } else {
- String id = uri.substring(pos + 1);
- for (Element elem : PolicyConstants
- .findAllPolicyElementsOfLocalName(doc,
- Constants.ELEM_POLICY)) {
+ }
+ String id = uri.substring(pos + 1);
+ for (Element elem : PolicyConstants
+ .findAllPolicyElementsOfLocalName(doc,
+ Constants.ELEM_POLICY)) {
- if (id.equals(elem.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI,
- PolicyConstants.WSU_ID_ATTR_NAME))) {
- return builder.getPolicy(elem);
- }
+ if (id.equals(elem.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI,
+ PolicyConstants.WSU_ID_ATTR_NAME))) {
+ return builder.getPolicy(elem);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
index 90c404d..122d0ef 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/BaseAlternativeSelector.java
@@ -59,14 +59,13 @@ public abstract class BaseAlternativeSelector implements AlternativeSelector {
if (a.equals(ra)) {
rNames.remove(ra.getName());
break;
- } else {
- // Workaround until Neethi assertions implementations do not override equals():
- // objects in lists can be different instances
- if ((a instanceof PrimitiveAssertion) && (ra instanceof PrimitiveAssertion)
- && ((PrimitiveAssertion) a).equal(ra)) {
- rNames.remove(ra.getName());
- break;
- }
+ }
+ // Workaround until Neethi assertions implementations do not override equals():
+ // objects in lists can be different instances
+ if ((a instanceof PrimitiveAssertion) && (ra instanceof PrimitiveAssertion)
+ && ((PrimitiveAssertion) a).equal(ra)) {
+ rNames.remove(ra.getName());
+ break;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java
index 0fbe65d..0b507cd 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java
@@ -67,9 +67,8 @@ public abstract class AbstractSequence {
public static boolean identifierEquals(Identifier id1, Identifier id2) {
if (null == id1) {
return null == id2;
- } else {
- return null != id2 && id1.getValue().equals(id2.getValue());
}
+ return null != id2 && id1.getValue().equals(id2.getValue());
}
public synchronized boolean isAcknowledged(long m) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
index 16ff41b..95d51c7 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
@@ -194,9 +194,8 @@ public final class EncoderDecoder10AImpl extends EncoderDecoder {
close.setIdentifier(VersionTransformer.convert(seq.getIdentifier()));
close.setLastMsgNumber(seq.getMessageNumber());
return close;
- } else {
- return null;
}
+ return null;
}
public SequenceAcknowledgement decodeSequenceAcknowledgement(Element elem) throws JAXBException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
index 55658a1..2c3e0f7 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
@@ -193,9 +193,8 @@ public final class EncoderDecoder10Impl extends EncoderDecoder {
close.setIdentifier(VersionTransformer.convert(seq.getIdentifier()));
close.setLastMsgNumber(seq.getMessageNumber());
return close;
- } else {
- return null;
}
+ return null;
}
public SequenceAcknowledgement decodeSequenceAcknowledgement(Element elem) throws JAXBException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
index 0c907eb..e63208f 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
@@ -191,9 +191,8 @@ final class InternalContextUtils {
&& partialResponse.getContent(Exception.class) != null) {
if (partialResponse.getContent(Exception.class) instanceof Fault) {
throw (Fault)partialResponse.getContent(Exception.class);
- } else {
- throw new Fault(partialResponse.getContent(Exception.class));
}
+ throw new Fault(partialResponse.getContent(Exception.class));
}
if (chain != null) {
chain.reset();
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
index 140241a..a418905 100755
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
@@ -135,9 +135,8 @@ public class ManagedRMEndpoint implements ManagedComponent {
public int getQueuedMessageTotalCount(boolean outbound) {
if (outbound) {
return endpoint.getManager().getRetransmissionQueue().countUnacknowledged();
- } else {
- return endpoint.getManager().getRedeliveryQueue().countUndelivered();
}
+ return endpoint.getManager().getRedeliveryQueue().countUndelivered();
}
@ManagedOperation(description = "Number of Queued Messages")
@@ -153,13 +152,12 @@ public class ManagedRMEndpoint implements ManagedComponent {
throw new IllegalArgumentException("no sequence");
}
return manager.getRetransmissionQueue().countUnacknowledged(ss);
- } else {
- DestinationSequence ds = getDestinationSeq(sid);
- if (null == ds) {
- throw new IllegalArgumentException("no sequence");
- }
- return manager.getRedeliveryQueue().countUndelivered(ds);
}
+ DestinationSequence ds = getDestinationSeq(sid);
+ if (null == ds) {
+ throw new IllegalArgumentException("no sequence");
+ }
+ return manager.getRedeliveryQueue().countUndelivered(ds);
}
@ManagedOperation(description = "List of UnAcknowledged Message Numbers")
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java
index cf79e25..53e2ac8 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java
@@ -72,20 +72,19 @@ public final class RMContextUtils {
public static RMProperties retrieveRMProperties(Message message, boolean outbound) {
if (outbound) {
return (RMProperties)message.get(getRMPropertiesKey(true));
- } else {
- Message m = null;
- if (MessageUtils.isOutbound(message)) {
- // the in properties are only available on the in message
- m = message.getExchange().getInMessage();
- if (null == m) {
- m = message.getExchange().getInFaultMessage();
- }
- } else {
- m = message;
- }
- if (null != m) {
- return (RMProperties)m.get(getRMPropertiesKey(false));
+ }
+ Message m = null;
+ if (MessageUtils.isOutbound(message)) {
+ // the in properties are only available on the in message
+ m = message.getExchange().getInMessage();
+ if (null == m) {
+ m = message.getExchange().getInFaultMessage();
}
+ } else {
+ m = message;
+ }
+ if (null != m) {
+ return (RMProperties)m.get(getRMPropertiesKey(false));
}
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
index a2080e4..cfd6af8 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
@@ -141,9 +141,8 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
"WSA_REQUIRED_EXC", LOG);
LOG.log(Level.INFO, msg.toString());
throw new RMException(msg);
- } else {
- return;
}
+ return;
}
String action = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java
index 09a3c9e..6b6f7a1 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java
@@ -183,9 +183,8 @@ public final class RMUtils {
public static boolean equalStrings(String aval, String bval) {
if (null != aval) {
return aval.equals(bval);
- } else {
- return null == bval;
}
+ return null == bval;
}
/**
@@ -198,8 +197,7 @@ public final class RMUtils {
public static boolean equalLongs(Long aval, Long bval) {
if (null != aval) {
return aval.equals(bval);
- } else {
- return null == bval;
}
+ return null == bval;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index 0590387..ece96b3 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -848,10 +848,9 @@ public class RMTxStore implements RMStore {
} catch (SQLException ex) {
if (!isTableExistsError(ex)) {
throw ex;
- } else {
- LOG.fine("Table CXF_RM_SRC_SEQUENCES already exists.");
- verifyTable(con, SRC_SEQUENCES_TABLE_NAME, SRC_SEQUENCES_TABLE_COLS);
}
+ LOG.fine("Table CXF_RM_SRC_SEQUENCES already exists.");
+ verifyTable(con, SRC_SEQUENCES_TABLE_NAME, SRC_SEQUENCES_TABLE_COLS);
} finally {
stmt.close();
}
@@ -862,10 +861,9 @@ public class RMTxStore implements RMStore {
} catch (SQLException ex) {
if (!isTableExistsError(ex)) {
throw ex;
- } else {
- LOG.fine("Table CXF_RM_DEST_SEQUENCES already exists.");
- verifyTable(con, DEST_SEQUENCES_TABLE_NAME, DEST_SEQUENCES_TABLE_COLS);
}
+ LOG.fine("Table CXF_RM_DEST_SEQUENCES already exists.");
+ verifyTable(con, DEST_SEQUENCES_TABLE_NAME, DEST_SEQUENCES_TABLE_COLS);
} finally {
stmt.close();
}
@@ -877,12 +875,11 @@ public class RMTxStore implements RMStore {
} catch (SQLException ex) {
if (!isTableExistsError(ex)) {
throw ex;
- } else {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Table " + tableName + " already exists.");
- }
- verifyTable(con, tableName, MESSAGES_TABLE_COLS);
}
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Table " + tableName + " already exists.");
+ }
+ verifyTable(con, tableName, MESSAGES_TABLE_COLS);
} finally {
stmt.close();
}
@@ -995,9 +992,8 @@ public class RMTxStore implements RMStore {
PreparedStatement stmt = cachedStatements.get(sql);
statementLocks.get(stmt).lock();
return stmt;
- } else {
- return con.prepareStatement(sql);
}
+ return con.prepareStatement(sql);
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
index 5f30bcf..2133044 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
@@ -54,8 +54,7 @@ public final class EHCacheUtils {
private static String getGlobalCacheManagerName(Bus bus) {
if (bus != null) {
return (String) bus.getProperty(GLOBAL_EHCACHE_MANAGER_NAME);
- } else {
- return null;
}
+ return null;
}
}