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 2017/02/15 11:35:54 UTC
[1/3] cxf git commit: Moving public loggers to private
Repository: cxf
Updated Branches:
refs/heads/master b433c753d -> 003fb1e7d
Moving public loggers to private
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4301392f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4301392f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4301392f
Branch: refs/heads/master
Commit: 4301392fae084db72886290091ea5745144d97f5
Parents: b433c75
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 15 09:29:31 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 15 09:29:31 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java | 2 +-
core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java | 2 +-
core/src/main/java/org/apache/cxf/common/logging/LogUtils.java | 2 +-
.../aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java | 2 +-
.../main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java | 2 +-
.../main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java | 2 +-
.../tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java | 2 +-
.../jaxws/validator/WrapperStyleNameCollisionValidator.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index fbf268b..ce71ac8 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -46,7 +46,7 @@ import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.resource.SinglePropertyResolver;
public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLocator {
- public static final Logger LOG = LogUtils.getL7dLogger(ExtensionManagerImpl.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(ExtensionManagerImpl.class);
public static final String EXTENSIONMANAGER_PROPERTY_NAME = "extensionManager";
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 3e42b20..8c827b0 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -92,7 +92,7 @@ import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.JavaUtils;
public final class JAXBUtils {
- public static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
public enum IdentifierType {
CLASS,
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index 4195913..c4f0742 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -51,7 +51,7 @@ import org.apache.cxf.common.util.StringUtils;
* CXF provides {@link Log4jLogger} to use log4j instead of java.util.logging.
*/
public final class LogUtils {
- public static final String KEY = "org.apache.cxf.Logger";
+ private static final String KEY = "org.apache.cxf.Logger";
private static final Object[] NO_PARAMETERS = new Object[0];
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
index f6935ae..69df9b9 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
@@ -39,7 +39,7 @@ import org.apache.ws.commons.schema.constants.Constants;
* Static methods/constants for Aegis.
*/
public final class TypeUtil {
- public static final Logger LOG = LogUtils.getL7dLogger(TypeUtil.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(TypeUtil.class);
private TypeUtil() {
//utility class
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
index 90c2b6f..14f8775 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
@@ -34,7 +34,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
*
*/
public class ThrottlingInterceptor extends AbstractPhaseInterceptor<Message> {
- public static final Logger LOG = LogUtils.getL7dLogger(ThrottlingInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(ThrottlingInterceptor.class);
final ThrottlingManager manager;
public ThrottlingInterceptor(String phase, ThrottlingManager manager) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
index b14dbc7..e1e73b3 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
@@ -56,7 +56,7 @@ import org.apache.cxf.tools.plugin.Generator;
import org.apache.cxf.tools.plugin.Plugin;
public final class PluginLoader {
- public static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
public static final String DEFAULT_PROVIDER_NAME = "cxf.apache.org";
private static PluginLoader pluginLoader;
private static final String PLUGIN_FILE_NAME = "META-INF/tools-plugin.xml";
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
index db434f3..f0baa66 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
@@ -40,7 +40,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.validator.ServiceValidator;
public class UniqueBodyValidator extends ServiceValidator {
- public static final Logger LOG = LogUtils.getL7dLogger(UniqueBodyValidator.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(UniqueBodyValidator.class);
public UniqueBodyValidator() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4301392f/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index 4b8bdf6..781d673 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -41,7 +41,7 @@ import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUt
import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.WrapperElement;
public class WrapperStyleNameCollisionValidator extends ServiceValidator {
- public static final Logger LOG = LogUtils.getL7dLogger(WrapperStyleNameCollisionValidator.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(WrapperStyleNameCollisionValidator.class);
public WrapperStyleNameCollisionValidator() {
}
[2/3] cxf git commit: Replace .size() > 0 with !isEmpty() for
collections
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index e314760..bd4b807 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -227,7 +227,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
addSupportingTokens();
- if (encryptionToken != null && encrParts.size() > 0) {
+ if (encryptionToken != null && !encrParts.isEmpty()) {
if (isRequestor()) {
encrParts.addAll(encryptedTokensList);
}
@@ -255,7 +255,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
}
sigParts.addAll(this.getSignedParts());
- if (sigParts.size() > 0) {
+ if (!sigParts.isEmpty()) {
AbstractTokenWrapper sigAbstractTokenWrapper = getSignatureToken();
if (sigAbstractTokenWrapper != null) {
AbstractToken sigToken = sigAbstractTokenWrapper.getToken();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
index ffa7add..aa66be3 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
@@ -213,7 +213,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
//Sign the message
//We should use the same key in the case of EncryptBeforeSig
- if (sigParts.size() > 0) {
+ if (!sigParts.isEmpty()) {
addSig(this.doSignature(sigParts, encryptionWrapper, encryptionToken,
tok, attached));
}
@@ -224,7 +224,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
//Check for signature protection and encryption of UsernameToken
if (sbinding.isEncryptSignature()
- || encryptedTokensList.size() > 0 && isRequestor()) {
+ || !encryptedTokensList.isEmpty() && isRequestor()) {
List<WSEncryptionPart> secondEncrParts = new ArrayList<>();
//Now encrypt the signature using the above token
@@ -509,7 +509,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
List<WSEncryptionPart> encrParts,
boolean atEnd) {
//Do encryption
- if (recToken != null && recToken.getToken() != null && encrParts.size() > 0) {
+ if (recToken != null && recToken.getToken() != null && !encrParts.isEmpty()) {
AbstractToken encrToken = recToken.getToken();
assertPolicy(recToken);
assertPolicy(encrToken);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
index 0c6a751..953b59a 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
@@ -148,7 +148,7 @@ public class BareInInterceptor extends AbstractInDatabindingInterceptor {
}
paramNum++;
}
- if (parameters.size() > 0) {
+ if (!parameters.isEmpty()) {
message.setContent(List.class, parameters);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index b49bbf8..9a01416 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -197,7 +197,7 @@ public final class SchemaUtil {
}
Map<String, List<?>> imports = CastUtils.cast(schema.getImports());
- if (imports != null && imports.size() > 0) {
+ if (imports != null && !imports.isEmpty()) {
for (Map.Entry<String, List<?>> entry : imports.entrySet()) {
String importNamespace = entry.getKey();
List<SchemaImport> schemaImports = CastUtils.cast(entry.getValue());
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
index 31c764a..494643b 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
@@ -412,7 +412,7 @@ public class WSDLServiceBuilder {
DestinationFactory factory = null;
EndpointInfo ei = null;
- if (null != elements && elements.size() > 0) {
+ if (null != elements && !elements.isEmpty()) {
for (ExtensibilityElement el : CastUtils.cast(elements, ExtensibilityElement.class)) {
ns = el.getElementType().getNamespaceURI();
try {
@@ -431,7 +431,7 @@ public class WSDLServiceBuilder {
if (factory == null) { // get the transport id from bindingInfo
elements = port.getBinding().getExtensibilityElements();
- if (null != elements && elements.size() > 0) {
+ if (null != elements && !elements.isEmpty()) {
for (ExtensibilityElement el : CastUtils.cast(elements, ExtensibilityElement.class)) {
if (el instanceof SOAPBinding) {
ns = ((SOAPBinding)el).getTransportURI();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index 04c7100..0594e2e 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -160,7 +160,7 @@ public class WSDLServiceBuilderTest extends Assert {
control.replay();
serviceInfos = wsdlServiceBuilder.buildServices(def, service, endpointName);
- if (serviceInfos.size() > 0) {
+ if (!serviceInfos.isEmpty()) {
serviceInfo = serviceInfos.get(0);
} else {
serviceInfo = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
index 9329fa7..c89df6c 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
@@ -209,7 +209,7 @@ public class LdapClaimsHandler implements ClaimsHandler, RealmSupport {
for (String userBase : userBaseDNs) {
ldapAttributes = LdapUtils.getAttributesOfEntry(ldap, userBase, this.getObjectClass(), this
.getUserNameAttribute(), user, searchAttributes);
- if (ldapAttributes != null && ldapAttributes.size() > 0) {
+ if (ldapAttributes != null && !ldapAttributes.isEmpty()) {
break; // User found
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
index bbd23c2..b453ae6 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
@@ -85,7 +85,7 @@ public final class LdapUtils {
result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(),
SearchControls.SUBTREE_SCOPE, searchAttributes, mapper);
- if (result != null && result.size() > 0) {
+ if (result != null && !result.isEmpty()) {
ldapAttributes = CastUtils.cast((Map<?, ?>)result.get(0));
}
@@ -133,7 +133,7 @@ public final class LdapUtils {
result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(),
SearchControls.SUBTREE_SCOPE, searchAttributes, mapper);
- if (result != null && result.size() > 0) {
+ if (result != null && !result.isEmpty()) {
ldapAttributes = CastUtils.cast((List<?>)result);
}
@@ -158,7 +158,7 @@ public final class LdapUtils {
List<Name> result = ldapTemplate.search((baseDN == null) ? "" : baseDN, filter.toString(),
SearchControls.SUBTREE_SCOPE, mapper);
- if (result != null && result.size() > 0) {
+ if (result != null && !result.isEmpty()) {
//not only the first one....
return result.get(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
index 21827d8..75a4415 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
@@ -225,7 +225,7 @@ public class ClaimUtils {
ProcessedClaim c = get(processedClaims, sc);
if (c != null) {
List<Object> values = c.getValues();
- if (values != null && values.size() > 0) {
+ if (values != null && !values.isEmpty()) {
if (mergedProcessedClaim == null) {
// First match TODO refactor for better method override
mergedProcessedClaim = c.clone();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
index 74675c9..d38eecf 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
@@ -383,7 +383,7 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
// Try DOM results first
- if (handlerResults != null && handlerResults.size() > 0) {
+ if (handlerResults != null && !handlerResults.isEmpty()) {
WSHandlerResult handlerResult = handlerResults.get(0);
List<WSSecurityEngineResult> engineResults = handlerResult.getResults();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index 907dc59..fdd3169 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -728,7 +728,7 @@ public class RequestParser {
final List<WSHandlerResult> handlerResults =
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
- if (handlerResults != null && handlerResults.size() > 0) {
+ if (handlerResults != null && !handlerResults.isEmpty()) {
WSHandlerResult handlerResult = handlerResults.get(0);
List<WSSecurityEngineResult> engineResults = handlerResult.getResults();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
index 2def957..c7700b4 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
@@ -155,7 +155,7 @@ public class SCTCanceller implements TokenCanceller {
final List<WSHandlerResult> handlerResults =
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
- if (handlerResults != null && handlerResults.size() > 0) {
+ if (handlerResults != null && !handlerResults.isEmpty()) {
WSHandlerResult handlerResult = handlerResults.get(0);
List<WSSecurityEngineResult> signedResults =
handlerResult.getActionResults().get(WSConstants.SIGN);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
index da4a01b..310a9a1 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
@@ -329,7 +329,7 @@ public class SAMLTokenProvider extends AbstractSAMLTokenProvider implements Toke
// Parse the AttributeStatements
List<AttributeStatementBean> attrBeanList = null;
- if (attributeStatementProviders != null && attributeStatementProviders.size() > 0) {
+ if (attributeStatementProviders != null && !attributeStatementProviders.isEmpty()) {
attrBeanList = new ArrayList<>();
for (AttributeStatementProvider statementProvider : attributeStatementProviders) {
AttributeStatementBean statementBean = statementProvider.getStatement(tokenParameters);
@@ -349,7 +349,7 @@ public class SAMLTokenProvider extends AbstractSAMLTokenProvider implements Toke
// Parse the AuthenticationStatements
List<AuthenticationStatementBean> authBeanList = null;
- if (authenticationStatementProviders != null && authenticationStatementProviders.size() > 0) {
+ if (authenticationStatementProviders != null && !authenticationStatementProviders.isEmpty()) {
authBeanList = new ArrayList<>();
for (AuthenticationStatementProvider statementProvider : authenticationStatementProviders) {
AuthenticationStatementBean statementBean = statementProvider.getStatement(tokenParameters);
@@ -370,7 +370,7 @@ public class SAMLTokenProvider extends AbstractSAMLTokenProvider implements Toke
// Parse the AuthDecisionStatements
List<AuthDecisionStatementBean> authDecisionBeanList = null;
if (authDecisionStatementProviders != null
- && authDecisionStatementProviders.size() > 0) {
+ && !authDecisionStatementProviders.isEmpty()) {
authDecisionBeanList = new ArrayList<>();
for (AuthDecisionStatementProvider statementProvider : authDecisionStatementProviders) {
AuthDecisionStatementBean statementBean = statementProvider.getStatement(tokenParameters);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index eaa8322..fb7906a 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -554,7 +554,7 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token
CastUtils.cast((List<?>) messageContext.get(WSHandlerConstants.RECV_RESULTS));
List<WSSecurityEngineResult> signedResults = new ArrayList<>();
- if (handlerResults != null && handlerResults.size() > 0) {
+ if (handlerResults != null && !handlerResults.isEmpty()) {
WSHandlerResult handlerResult = handlerResults.get(0);
if (handlerResult.getActionResults().containsKey(WSConstants.SIGN)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
index d4c6a5f..4fb46a4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
@@ -62,7 +62,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
public ProcessedClaimCollection retrieveClaimValues(
ClaimCollection claims, ClaimsParameters parameters) {
- if (claims != null && claims.size() > 0) {
+ if (claims != null && !claims.isEmpty()) {
ProcessedClaimCollection claimCollection = new ProcessedClaimCollection();
for (Claim requestClaim : claims) {
ProcessedClaim claim = new ProcessedClaim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java
index 80cdba2..67243ed 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java
@@ -48,7 +48,7 @@ public class CustomUserClaimsHandler implements ClaimsHandler {
public ProcessedClaimCollection retrieveClaimValues(
ClaimCollection claims, ClaimsParameters parameters) {
- if (claims != null && claims.size() > 0) {
+ if (claims != null && !claims.isEmpty()) {
ProcessedClaimCollection claimCollection = new ProcessedClaimCollection();
for (Claim requestClaim : claims) {
ProcessedClaim claim = new ProcessedClaim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
index 65ddc6b..412d996 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
@@ -75,7 +75,7 @@ public class RealmSupportClaimsHandler implements ClaimsHandler, RealmSupport {
+ "' not in supportedRealm list: " + supportedRealms);
}
- if (claims != null && claims.size() > 0) {
+ if (claims != null && !claims.isEmpty()) {
ProcessedClaimCollection claimCollection = new ProcessedClaimCollection();
for (Claim requestClaim : claims) {
if (getSupportedClaimTypes().indexOf(requestClaim.getClaimType()) != -1) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
index d486b11..fc43ed8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomClaimsHandler.java
@@ -47,7 +47,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
public ProcessedClaimCollection retrieveClaimValues(
ClaimCollection claims, ClaimsParameters parameters) {
- if (claims != null && claims.size() > 0) {
+ if (claims != null && !claims.isEmpty()) {
ProcessedClaimCollection claimCollection = new ProcessedClaimCollection();
List<Element> customContent = parameters.getTokenRequirements().getCustomContent();
boolean foundContent = false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
index 4b866f4..25092b8 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
@@ -44,7 +44,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
public ProcessedClaimCollection retrieveClaimValues(
ClaimCollection claims, ClaimsParameters parameters) {
- if (claims != null && claims.size() > 0) {
+ if (claims != null && !claims.isEmpty()) {
ProcessedClaimCollection claimCollection = new ProcessedClaimCollection();
for (Claim requestClaim : claims) {
ProcessedClaim claim = new ProcessedClaim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
index 6023fd9..f0db501 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
@@ -226,7 +226,7 @@ public class SCTSAMLTokenProvider implements TokenProvider {
) throws Exception {
// Parse the AttributeStatements
List<AttributeStatementBean> attrBeanList = null;
- if (attributeStatementProviders != null && attributeStatementProviders.size() > 0) {
+ if (attributeStatementProviders != null && !attributeStatementProviders.isEmpty()) {
attrBeanList = new ArrayList<>();
for (AttributeStatementProvider statementProvider : attributeStatementProviders) {
AttributeStatementBean statementBean = statementProvider.getStatement(tokenParameters);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
index 1e9068e..7c96b31 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
@@ -44,7 +44,7 @@ public class CustomClaimsHandler implements ClaimsHandler {
public ProcessedClaimCollection retrieveClaimValues(
ClaimCollection claims, ClaimsParameters parameters) {
- if (claims != null && claims.size() > 0) {
+ if (claims != null && !claims.isEmpty()) {
ProcessedClaimCollection claimCollection = new ProcessedClaimCollection();
for (Claim requestClaim : claims) {
ProcessedClaim claim = new ProcessedClaim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 65399a3..d172474 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -165,7 +165,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
@@ -205,7 +205,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
@@ -244,7 +244,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod != null && confirmMethod.contains("bearer"));
@@ -283,7 +283,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertNotNull(confirmMethod);
@@ -343,7 +343,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod != null && confirmMethod.contains("bearer"));
@@ -380,7 +380,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod != null && confirmMethod.contains("bearer"));
@@ -447,7 +447,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod != null && confirmMethod.contains("bearer"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index 6780e7d..cb04f82 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -206,7 +206,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
@@ -248,7 +248,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
@@ -290,7 +290,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
@@ -332,7 +332,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
@@ -374,7 +374,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod.contains("bearer"));
@@ -414,7 +414,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod.contains("bearer"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
index e0b4836..b8ab009 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
@@ -77,7 +77,7 @@ public class STSUnitTest extends BasicSTSIntegrationTest {
List<String> methods = assertion.getConfirmationMethods();
String confirmMethod = null;
- if (methods != null && methods.size() > 0) {
+ if (methods != null && !methods.isEmpty()) {
confirmMethod = methods.get(0);
}
Assert.assertTrue(confirmMethod.contains("bearer"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
index 9c85416..a5adcbe 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java
@@ -75,7 +75,7 @@ public class HashMapAdapter extends XmlAdapter<HashMapAdapter.HashMapType, Map<S
public HashMapType marshal(Map<String, byte[]> arg0) throws Exception {
HashMapType myHashMapType = new HashMapType();
- if (arg0 != null && arg0.size() > 0) {
+ if (arg0 != null && !arg0.isEmpty()) {
for (Map.Entry<String, byte[]> entry : arg0.entrySet()) {
if (entry != null) {
HashMapEntryType myHashEntryType = new HashMapEntryType();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 8311508..013f573 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -756,7 +756,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals(200, wc.getResponse().getStatus());
assertEquals(123L, book.getId());
MultivaluedMap<String, Object> headers = wc.getResponse().getMetadata();
- assertTrue(headers.size() > 0);
+ assertTrue(!headers.isEmpty());
Object etag = headers.getFirst("ETag");
assertNotNull(etag);
assertTrue(etag.toString().startsWith("\""));
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
index bc04e9e..f766bd3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
@@ -162,7 +162,7 @@ public class JAXRSClientServerStreamingTest extends AbstractBusClientServerTestB
public void writeTo(Object obj, Class<?> cls, Type genericType, Annotation[] anns,
MediaType m, MultivaluedMap<String, Object> headers, OutputStream os) throws IOException {
List<String> failHeaders = getContext().getHttpHeaders().getRequestHeader("fail-write");
- if (failHeaders != null && failHeaders.size() > 0) {
+ if (failHeaders != null && !failHeaders.isEmpty()) {
os.write("fail".getBytes());
throw new IOException();
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
index 1cac266..30213f6 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java
@@ -52,12 +52,12 @@ public class DoubleItBSTImpl implements DoubleItPortType {
List<WSHandlerResult> results =
CastUtils.cast((List<?>)wsContext.getMessageContext().get(WSHandlerConstants.RECV_RESULTS));
Assert.assertNotNull("Security Results cannot be null", results);
- Assert.assertTrue(results.size() > 0);
+ Assert.assertTrue(!results.isEmpty());
WSHandlerResult result = results.get(0);
List<WSSecurityEngineResult> securityResults = result.getResults();
Assert.assertNotNull("Security Results cannot be null", securityResults);
- Assert.assertTrue(securityResults.size() > 0);
+ Assert.assertTrue(!securityResults.isEmpty());
WSSecurityEngineResult securityResult = securityResults.get(0);
BinarySecurity binarySecurityToken =
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index 8420e34..98bbea0 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -246,7 +246,7 @@ public class ToolContext {
}
public boolean isExcludeNamespaceEnabled() {
- return excludeNamespacePackageMap.size() > 0;
+ return !excludeNamespacePackageMap.isEmpty();
}
public List<String> getExcludePkgList() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
index bc077fb..d244592 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
@@ -167,7 +167,7 @@ public class ToolSpec {
List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(),
Tool.TOOL_SPEC_PUBLIC_ID,
"streams");
- if (elemList.size() > 0) {
+ if (!elemList.isEmpty()) {
return elemList.get(0);
} else {
return null;
@@ -223,7 +223,7 @@ public class ToolSpec {
List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(),
Tool.TOOL_SPEC_PUBLIC_ID,
"pipeline");
- if (elemList.size() > 0) {
+ if (!elemList.isEmpty()) {
return elemList.get(0);
} else {
return null;
@@ -283,7 +283,7 @@ public class ToolSpec {
DOMUtils.findAllElementsByTagNameNS(el,
"http://cxf.apache.org/Xpipe/ToolSpecification",
"associatedArgument");
- if (elemList.size() > 0) {
+ if (!elemList.isEmpty()) {
Element assArg = elemList.get(0);
if (assArg.hasAttribute("default")) {
return assArg.getAttribute("default");
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
index 9f8f6ec..a1f0b06 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
@@ -121,7 +121,7 @@ public class CommandLineParser {
LOG.fine("Found " + usageForms.size()
+ " alternative forms of usage, will use default form");
}
- if (usageForms.size() > 0) {
+ if (!usageForms.isEmpty()) {
ErrorVisitor errors = new ErrorVisitor();
for (Element elem : usageForms) {
@@ -333,7 +333,7 @@ public class CommandLineParser {
"annotation");
- if ((annotations != null) && (annotations.size() > 0)) {
+ if ((annotations != null) && (!annotations.isEmpty())) {
result = annotations.get(0).getFirstChild().getNodeValue();
}
return result;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
index fb22a56..c8b531e 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
@@ -48,21 +48,21 @@ public class Option implements TokenConsumer {
List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(element,
Tool.TOOL_SPEC_PUBLIC_ID,
"associatedArgument");
- if (elemList != null && elemList.size() > 0) {
+ if (elemList != null && !elemList.isEmpty()) {
argument = elemList.get(0);
}
elemList = DOMUtils.findAllElementsByTagNameNS(element,
Tool.TOOL_SPEC_PUBLIC_ID,
"annotation");
- if (elemList != null && elemList.size() > 0) {
+ if (elemList != null && !elemList.isEmpty()) {
annotation = elemList.get(0);
}
if (annotation == null && argument != null) {
elemList = DOMUtils.findAllElementsByTagNameNS(argument, Tool.TOOL_SPEC_PUBLIC_ID, "annotation");
- if (elemList != null && elemList.size() > 0) {
+ if (elemList != null && !elemList.isEmpty()) {
annotation = elemList.get(0);
}
}
@@ -165,7 +165,7 @@ public class Option implements TokenConsumer {
//NodeList list = argument.getElementsByTagNameNS(Tool.TOOL_SPEC_PUBLIC_ID, "valuetype");
String valuetypeStr = null;
- if (list != null && list.size() > 0) {
+ if (list != null && !list.isEmpty()) {
valueType = list.get(0);
valuetypeStr = valueType.getFirstChild().getNodeValue();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/common/src/main/java/org/apache/cxf/tools/util/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/JAXBUtils.java b/tools/common/src/main/java/org/apache/cxf/tools/util/JAXBUtils.java
index 6ca750c..cb21444 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/JAXBUtils.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/JAXBUtils.java
@@ -43,7 +43,7 @@ public final class JAXBUtils {
String schemaNamespace = schema.getNamespaceURI();
List<Element> annoList = DOMUtils.findAllElementsByTagNameNS(schema, schemaNamespace, "annotation");
Element annotation = null;
- if (annoList.size() > 0) {
+ if (!annoList.isEmpty()) {
annotation = annoList.get(0);
} else {
annotation = schema.getOwnerDocument().createElementNS(schemaNamespace, "annotation");
@@ -52,7 +52,7 @@ public final class JAXBUtils {
schemaNamespace,
"appinfo");
Element appInfo = null;
- if (appList.size() > 0) {
+ if (!appList.isEmpty()) {
appInfo = appList.get(0);
} else {
appInfo = schema.getOwnerDocument().createElementNS(schemaNamespace, "appinfo");
@@ -63,7 +63,7 @@ public final class JAXBUtils {
List<Element> jaxbList = DOMUtils.findAllElementsByTagNameNS(schema,
ToolConstants.NS_JAXB_BINDINGS,
"schemaBindings");
- if (jaxbList.size() > 0) {
+ if (!jaxbList.isEmpty()) {
jaxbBindings = jaxbList.get(0);
} else {
jaxbBindings = schema.getOwnerDocument().createElementNS(ToolConstants.NS_JAXB_BINDINGS,
@@ -91,7 +91,7 @@ public final class JAXBUtils {
ToolConstants.NS_JAXB_BINDINGS,
"package");
Element packagename = null;
- if (pkgList.size() > 0) {
+ if (!pkgList.isEmpty()) {
packagename = pkgList.get(0);
} else {
packagename = doc.createElementNS(ToolConstants.NS_JAXB_BINDINGS, "package");
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
index 2bbf10d..3c676e9 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
@@ -163,6 +163,6 @@ public class ProcessorEnvironment {
}
public boolean isExcludeNamespaceEnabled() {
- return excludeNamespacePackageMap.size() > 0;
+ return !excludeNamespacePackageMap.isEmpty();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
index 7c42840..11f6f47 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
@@ -80,7 +80,7 @@ public final class IdlRoot extends IdlScopeBase {
pw.println("#include " + s);
}
- if (includeList.size() > 0) {
+ if (!includeList.isEmpty()) {
pw.println();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
index baa34a6..f13a421 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
@@ -336,7 +336,7 @@ public final class IdlPreprocessorReader extends Reader {
buf.append(LF);
}
try {
- if (includeStack.size() > 0) {
+ if (!includeStack.isEmpty()) {
final IncludeStackEntry newTopEntry = includeStack.peek();
final LineNumberReader reader = getReader();
final int lineNumber = reader.getLineNumber();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
index a2e23f9..a770242 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
@@ -302,7 +302,7 @@ public final class WSDLParameter {
private void processReturnParams(List<ParamType> outputs, List<ArgType> returns) {
- if (outputs.size() > 0) {
+ if (!outputs.isEmpty()) {
ParamType d2 = outputs.get(0);
if (d2.getMode().value().equals("out")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
index d471369..9c85845 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
@@ -138,7 +138,7 @@ public class WSDLToCorbaBinding {
helper.setXMLSchemaList(xmlSchemaList);
List<PortType> intfs = null;
- if (interfaceNames.size() > 0) {
+ if (!interfaceNames.isEmpty()) {
intfs = new ArrayList<>(interfaceNames.size());
for (String interfaceName : interfaceNames) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java
index c314666..ea67dfc 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaProcessor.java
@@ -167,7 +167,7 @@ public class WSDLToCorbaProcessor extends WSDLToProcessor {
} else {
//try to get the binding name from the wsdlToCorbaBinding
java.util.List<String> bindingNames = wsdlToCorbaBinding.getGeneratedBindingNames();
- if ((bindingNames != null) && (bindingNames.size() > 0)) {
+ if ((bindingNames != null) && (!bindingNames.isEmpty())) {
idlAction.setBindingName(bindingNames.get(0));
if (bindingNames.size() > 1) {
System.err.println("Warning: Generating idl only for the binding "
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
index 7535555..b1eff09 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidationResult.java
@@ -52,7 +52,7 @@ public final class ValidationResult {
}
public boolean hasWarnings() {
- return warnings.size() > 0;
+ return !warnings.isEmpty();
}
public boolean isSuccessful() {
@@ -66,14 +66,14 @@ public final class ValidationResult {
sb.append(errors.size());
sb.append(", Warnings: ");
sb.append(warnings.size());
- if (errors.size() > 0) {
+ if (!errors.isEmpty()) {
sb.append("\n\n <<< ERROR! \n");
while (!errors.empty()) {
sb.append(errors.pop());
sb.append("\n");
}
}
- if (warnings.size() > 0) {
+ if (!warnings.isEmpty()) {
sb.append("\n <<< WARNING! \n");
while (!warnings.empty()) {
sb.append(warnings.pop());
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 4a8a3c5..4dc3619 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -1148,7 +1148,7 @@ public class SourceGenerator {
if (!suspendedAsync && !responseRequired && responseEls.size() == 1 && generateResponseIfHeadersSet) {
List<Element> outResponseParamElements =
getParameters(responseEls.get(0), Collections.<Element>emptyList(), false);
- if (outResponseParamElements.size() > 0) {
+ if (!outResponseParamElements.isEmpty()) {
writeJaxrResponse(sbCode, imports);
return true;
}
@@ -1268,7 +1268,7 @@ public class SourceGenerator {
if (generateEnums) {
List<Element> options =
DOMUtils.findAllElementsByTagNameNS(paramEl, getWadlNamespace(), "option");
- if (options.size() > 0) {
+ if (!options.isEmpty()) {
generateEnumClass(getTypicalClassName(name), options, info.getSrcDir(), classPackage);
enumCreated = true;
}
@@ -1353,7 +1353,7 @@ public class SourceGenerator {
elementParamName = !multipart ? "map" : "body";
}
if (elementParamType != null) {
- if (inParamEls.size() > 0) {
+ if (!inParamEls.isEmpty()) {
sbCode.append(", ");
}
if (writeBeanValidation) {
@@ -1367,7 +1367,7 @@ public class SourceGenerator {
writeMethodParamDocs(repElement, elementParamName, sbMethodDocs);
}
if (suspendedAsync) {
- if (inParamEls.size() > 0 || elementParamType != null) {
+ if (!inParamEls.isEmpty() || elementParamType != null) {
sbCode.append(", ");
}
if (writeAnnotations) {
@@ -1883,7 +1883,7 @@ public class SourceGenerator {
compiler.setErrorListener(elForRun);
compiler.setEntityResolver(OASISCatalogManager.getCatalogManager(bus)
.getEntityResolver());
- if (compilerArgs.size() > 0) {
+ if (!compilerArgs.isEmpty()) {
compiler.getOptions().addGrammar(new InputSource("null"));
compiler.getOptions().parseArguments(compilerArgs.toArray(new String[compilerArgs.size()]));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
index e1e73b3..3d83608 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
@@ -56,8 +56,8 @@ import org.apache.cxf.tools.plugin.Generator;
import org.apache.cxf.tools.plugin.Plugin;
public final class PluginLoader {
- private static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
public static final String DEFAULT_PROVIDER_NAME = "cxf.apache.org";
+ public static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
private static PluginLoader pluginLoader;
private static final String PLUGIN_FILE_NAME = "META-INF/tools-plugin.xml";
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java
index f5e0be3..ba3d76a 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java
@@ -75,7 +75,7 @@ public class HandlerConfigGenerator extends AbstractJAXWSGenerator {
List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(e,
ToolConstants.HANDLER_CHAINS_URI,
ToolConstants.HANDLER_CHAIN);
- if (elemList.size() > 0) {
+ if (!elemList.isEmpty()) {
String fName = ProcessorUtil.getHandlerConfigFileName(this.intf.getName());
handlerChainAnnotation = new JAnnotation(HandlerChain.class);
handlerChainAnnotation.addElement(new JAnnotationElement("name",
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
index ce72ea6..59ee6ce 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
@@ -601,7 +601,7 @@ public class ParameterProcessor extends AbstractProcessor {
if (inputMessage != null) {
List<MessagePartInfo> inputParts = inputMessage.getMessageParts();
- MessagePartInfo inputPart = inputParts.size() > 0 ? inputParts.iterator().next() : null;
+ MessagePartInfo inputPart = !inputParts.isEmpty() ? inputParts.iterator().next() : null;
List<QName> inputWrapElement = null;
if (inputPart != null && inputPart.isElement()) {
inputWrapElement = ProcessorUtil.getWrappedElementQNames(context,
@@ -620,7 +620,7 @@ public class ParameterProcessor extends AbstractProcessor {
}
if (outputMessage != null) {
List<MessagePartInfo> outputParts = outputMessage.getMessageParts();
- MessagePartInfo outputPart = outputParts.size() > 0 ? outputParts.iterator().next() : null;
+ MessagePartInfo outputPart = !outputParts.isEmpty() ? outputParts.iterator().next() : null;
List<QName> outputWrapElement = null;
if (outputPart != null && outputPart.isElement()) {
outputWrapElement = ProcessorUtil.getWrappedElementQNames(context,
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
index f0baa66..db434f3 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
@@ -40,7 +40,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.validator.ServiceValidator;
public class UniqueBodyValidator extends ServiceValidator {
- private static final Logger LOG = LogUtils.getL7dLogger(UniqueBodyValidator.class);
+ public static final Logger LOG = LogUtils.getL7dLogger(UniqueBodyValidator.class);
public UniqueBodyValidator() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
index c375ab0..582fd65 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
@@ -226,7 +226,7 @@ public class JAXWSContainerTest extends ProcessorTestBase {
JAXWSContainer container = new JAXWSContainer(null);
List<ServiceValidator> validators = container.getServiceValidators();
assertNotNull(validators);
- assertTrue(validators.size() > 0);
+ assertTrue(!validators.isEmpty());
}
protected String getLocation(String wsdlFile) throws URISyntaxException {
[3/3] cxf git commit: Replace .size() > 0 with !isEmpty() for
collections
Posted by co...@apache.org.
Replace .size() > 0 with !isEmpty() for collections
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/003fb1e7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/003fb1e7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/003fb1e7
Branch: refs/heads/master
Commit: 003fb1e7d2e5790ee44b110da83e1e97ed7d0ec5
Parents: 4301392
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 15 10:55:55 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 15 10:55:55 2017 +0000
----------------------------------------------------------------------
.../org/apache/cxf/attachment/AttachmentUtil.java | 4 ++--
.../cxf/bus/extension/ExtensionManagerImpl.java | 5 -----
.../org/apache/cxf/common/jaxb/JAXBUtils.java | 5 ++---
.../stax/StaxDataBindingInterceptor.java | 2 +-
.../cxf/interceptor/ClientFaultConverter.java | 2 +-
.../java/org/apache/cxf/message/MessageImpl.java | 2 +-
.../apache/cxf/service/model/OperationInfo.java | 2 +-
.../apache/cxf/staxutils/W3CDOMStreamWriter.java | 2 +-
.../staxutils/transform/OutTransformWriter.java | 2 +-
.../AbstractBeanValidationInterceptor.java | 2 +-
.../binding/corba/runtime/CorbaObjectReader.java | 2 +-
.../binding/corba/runtime/CorbaObjectWriter.java | 2 +-
.../cxf/binding/soap/SoapBindingFactory.java | 4 ++--
.../org/apache/cxf/binding/soap/SoapFault.java | 2 +-
.../soap/interceptor/SoapActionInInterceptor.java | 4 ++--
.../soap/interceptor/SoapHeaderInterceptor.java | 2 +-
.../jms/interceptor/SoapJMSInInterceptor.java | 18 +++++++++---------
.../cxf/aegis/databinding/AegisDatabinding.java | 2 +-
.../org/apache/cxf/aegis/type/XMLTypeCreator.java | 2 +-
.../cxf/aegis/util/stax/JDOMStreamReader.java | 2 +-
.../AbstractStaticFailoverStrategy.java | 4 ++--
.../cxf/jaxrs/AbstractJAXRSFactoryBean.java | 2 +-
.../apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java | 2 +-
.../cxf/jaxrs/ext/multipart/MultipartBody.java | 2 +-
.../org/apache/cxf/jaxrs/impl/RequestImpl.java | 2 +-
.../cxf/jaxrs/impl/VariantListBuilderImpl.java | 12 ++++++------
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 2 +-
.../jaxrs/provider/RequestDispatcherProvider.java | 2 +-
.../cxf/jaxrs/provider/ServerProviderFactory.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 2 +-
.../jaxrs/security/JAASAuthenticationFilter.java | 2 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 4 ++--
.../apache/cxf/jaxrs/utils/InjectionUtils.java | 4 ++--
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 4 ++--
.../jaxrs/utils/multipart/AttachmentUtils.java | 2 +-
.../java/org/apache/cxf/jaxws/EndpointImpl.java | 2 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 2 +-
.../cxf/jaxws/support/JaxWsImplementorInfo.java | 4 ++--
.../jaxws/support/JaxWsServiceFactoryBean.java | 2 +-
.../endpoint/dynamic/DynamicClientFactory.java | 2 +-
.../apache/cxf/javascript/JsSimpleDomNode.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 2 +-
.../jaxrs/rx/server/StreamingAsyncSubscriber.java | 2 +-
.../apache/cxf/jaxrs/ext/search/SearchUtils.java | 2 +-
.../oauth/filters/AbstractAuthFilter.java | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 2 +-
...TPServerEngineFactoryBeanDefinitionParser.java | 2 +-
...tpServerEngineFactoryBeanDefinitionParser.java | 2 +-
...TPServerEngineFactoryBeanDefinitionParser.java | 2 +-
.../org/apache/cxf/transport/http/Cookies.java | 2 +-
.../apache/cxf/transport/http/HTTPConduit.java | 4 ++--
.../apache/cxf/transport/jms/JMSMessageUtils.java | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorImpl.java | 2 +-
.../main/java/org/apache/cxf/ws/rm/RMManager.java | 2 +-
.../org/apache/cxf/ws/rm/SequenceMonitor.java | 2 +-
.../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 2 +-
.../cxf/ws/rm/soap/RMSoapInInterceptor.java | 4 ++--
.../cxf/ws/rm/soap/RedeliveryQueueImpl.java | 2 +-
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 2 +-
.../IssuedTokenInterceptorProvider.java | 2 +-
.../KerberosTokenInterceptorProvider.java | 2 +-
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +-
.../ws/security/wss4j/WSS4JOutInterceptor.java | 2 +-
.../policyhandlers/AbstractBindingBuilder.java | 2 +-
.../policyhandlers/AsymmetricBindingHandler.java | 6 +++---
.../StaxAsymmetricBindingHandler.java | 8 ++++----
.../StaxSymmetricBindingHandler.java | 4 ++--
.../policyhandlers/SymmetricBindingHandler.java | 6 +++---
.../cxf/wsdl/interceptors/BareInInterceptor.java | 2 +-
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLServiceBuilder.java | 4 ++--
.../apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 2 +-
.../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +-
.../java/org/apache/cxf/sts/claims/LdapUtils.java | 6 +++---
.../apache/cxf/sts/claims/mapper/ClaimUtils.java | 2 +-
.../cxf/sts/operation/TokenIssueOperation.java | 2 +-
.../org/apache/cxf/sts/request/RequestParser.java | 2 +-
.../cxf/sts/token/canceller/SCTCanceller.java | 2 +-
.../cxf/sts/token/provider/SAMLTokenProvider.java | 6 +++---
.../cxf/sts/token/renewer/SAMLTokenRenewer.java | 2 +-
.../cxf/sts/common/CustomClaimsHandler.java | 2 +-
.../cxf/sts/common/CustomUserClaimsHandler.java | 2 +-
.../cxf/sts/common/RealmSupportClaimsHandler.java | 2 +-
.../systest/sts/custom/CustomClaimsHandler.java | 2 +-
.../sts/deployment/CustomClaimsHandler.java | 2 +-
.../sts/secure_conv/SCTSAMLTokenProvider.java | 2 +-
.../sts/deployment/CustomClaimsHandler.java | 2 +-
.../cxf/systest/sts/issueunit/IssueUnitTest.java | 14 +++++++-------
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 12 ++++++------
.../cxf/systest/sts/itests/unit/STSUnitTest.java | 2 +-
.../apache/cxf/systest/jaxb/HashMapAdapter.java | 2 +-
.../systest/jaxrs/JAXRSClientServerBookTest.java | 2 +-
.../jaxrs/JAXRSClientServerStreamingTest.java | 2 +-
.../cxf/systest/ws/tokens/DoubleItBSTImpl.java | 4 ++--
.../org/apache/cxf/tools/common/ToolContext.java | 2 +-
.../cxf/tools/common/toolspec/ToolSpec.java | 6 +++---
.../common/toolspec/parser/CommandLineParser.java | 4 ++--
.../cxf/tools/common/toolspec/parser/Option.java | 8 ++++----
.../java/org/apache/cxf/tools/util/JAXBUtils.java | 8 ++++----
.../tools/corba/common/ProcessorEnvironment.java | 2 +-
.../cxf/tools/corba/common/idltypes/IdlRoot.java | 2 +-
.../idlpreprocessor/IdlPreprocessorReader.java | 2 +-
.../corba/processors/wsdl/WSDLParameter.java | 2 +-
.../corba/processors/wsdl/WSDLToCorbaBinding.java | 2 +-
.../processors/wsdl/WSDLToCorbaProcessor.java | 2 +-
.../validator/internal/ValidationResult.java | 6 +++---
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 10 +++++-----
.../cxf/tools/wsdlto/core/PluginLoader.java | 2 +-
.../jaxws/generators/HandlerConfigGenerator.java | 2 +-
.../processor/internal/ParameterProcessor.java | 4 ++--
.../jaxws/validator/UniqueBodyValidator.java | 2 +-
.../tools/wsdlto/jaxws/JAXWSContainerTest.java | 2 +-
112 files changed, 176 insertions(+), 182 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index c6dd731..0e7275a 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -350,13 +350,13 @@ public final class AttachmentUtil {
}
static String getHeaderValue(List<String> v) {
- if (v != null && v.size() > 0) {
+ if (v != null && !v.isEmpty()) {
return v.get(0);
}
return null;
}
static String getHeaderValue(List<String> v, String delim) {
- if (v != null && v.size() > 0) {
+ if (v != null && !v.isEmpty()) {
StringBuilder b = new StringBuilder();
for (String s : v) {
if (b.length() > 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index ce71ac8..7a49518 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -33,11 +33,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Logger;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.ResourceInjector;
-import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ObjectTypeResolver;
@@ -46,9 +44,6 @@ import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.resource.SinglePropertyResolver;
public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLocator {
- private static final Logger LOG = LogUtils.getL7dLogger(ExtensionManagerImpl.class);
-
-
public static final String EXTENSIONMANAGER_PROPERTY_NAME = "extensionManager";
public static final String ACTIVATION_NAMESPACES_PROPERTY_NAME = "activationNamespaces";
public static final String ACTIVATION_NAMESPACES_SETTER_METHOD_NAME = "setActivationNamespaces";
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 8c827b0..83364b8 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -92,6 +92,8 @@ import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.JavaUtils;
public final class JAXBUtils {
+ public static final String JAXB_URI = "http://java.sun.com/xml/ns/jaxb";
+
private static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
public enum IdentifierType {
@@ -103,9 +105,6 @@ public final class JAXBUtils {
CONSTANT
};
- public static final String JAXB_URI = "http://java.sun.com/xml/ns/jaxb";
-
-
private static final char[] XML_NAME_PUNCTUATION_CHARS = new char[] {
/* hyphen */ '\u002D',
/* period */ '\u002E',
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
index 580afac..7c8ab6d 100644
--- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
@@ -77,7 +77,7 @@ public class StaxDataBindingInterceptor extends AbstractInDatabindingInterceptor
}
- if (parameters.size() > 0) {
+ if (!parameters.isEmpty()) {
message.setContent(List.class, parameters);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
index 4834340..5d2e7db 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
@@ -255,7 +255,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
}
stackTraceList.add(parseStackTrackLine(oneLine));
}
- if (stackTraceList.size() > 0 || cause != null) {
+ if (!stackTraceList.isEmpty() || cause != null) {
Exception e = msg.getContent(Exception.class);
if (!stackTraceList.isEmpty()) {
StackTraceElement[] stackTraceElement = new StackTraceElement[stackTraceList.size()];
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/message/MessageImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageImpl.java b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
index 1b3691b..0c2453d 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
@@ -184,7 +184,7 @@ public class MessageImpl extends StringMapImpl implements Message {
private static final long serialVersionUID = 7067290677790419348L;
public void putAll(Map<? extends String, ? extends Object> m) {
- if (m != null && m.size() > 0) {
+ if (m != null && !m.isEmpty()) {
super.putAll(m);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
index b4a64ac..69aa5f3 100644
--- a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
@@ -189,7 +189,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
}
public boolean hasFaults() {
- return faults != null && faults.size() > 0;
+ return faults != null && !faults.isEmpty();
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
index ae40f6e..f44a9fb 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
@@ -183,7 +183,7 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
}
public void writeEndElement() throws XMLStreamException {
- if (stack.size() > 0) {
+ if (!stack.isEmpty()) {
currentNode = stack.pop();
} else {
currentNode = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
index 56da591..a7ade15 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
@@ -399,7 +399,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
private boolean matchesDropped(boolean shallow) {
return (dropDepth > 0 && dropDepth <= currentDepth)
- || (shallow && (elementsStack.size() > 0 && dropElements.contains(elementsStack.get(0))));
+ || (shallow && (!elementsStack.isEmpty() && dropElements.contains(elementsStack.get(0))));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
index 0a04df1..80fac76 100644
--- a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
@@ -50,7 +50,7 @@ public abstract class AbstractBeanValidationInterceptor extends AbstractValidati
@Override
protected void handleValidation(final Message message, final Object resourceInstance,
final Method method, final List<Object> arguments) {
- if (arguments.size() > 0) {
+ if (!arguments.isEmpty()) {
BeanValidationProvider provider = getProvider(message);
provider.validateParameters(resourceInstance, method, unwrapArgs(arguments).toArray());
message.getExchange().put(BeanValidationProvider.class, provider);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
index 328de06..2c98528 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
@@ -364,7 +364,7 @@ public class CorbaObjectReader {
Union unionType = (Union)unionHandler.getType();
List<Unionbranch> branches = unionType.getUnionbranch();
CorbaObjectHandler discriminator = unionHandler.getDiscriminator();
- if (branches.size() > 0) {
+ if (!branches.isEmpty()) {
String discLabel = null;
if (discriminator.getTypeCodeKind().value() == TCKind._tk_enum) {
CorbaEnumHandler disc = (CorbaEnumHandler) discriminator;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
index a6af129..d4de7c4 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
@@ -311,7 +311,7 @@ public class CorbaObjectWriter {
public void writeUnion(CorbaObjectHandler obj) throws CorbaBindingException {
Union unionType = (Union) obj.getType();
List<Unionbranch> branches = unionType.getUnionbranch();
- if (branches.size() > 0) {
+ if (!branches.isEmpty()) {
CorbaObjectHandler discriminator = ((CorbaUnionHandler)obj).getDiscriminator();
this.write(discriminator);
CorbaObjectHandler unionValue = ((CorbaUnionHandler)obj).getValue();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
index 26db8dc..9fec946 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
@@ -243,7 +243,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (b.getInput() != null) {
List<String> bodyParts = null;
List<SoapHeaderInfo> headerInfos = b.getInput().getExtensors(SoapHeaderInfo.class);
- if (headerInfos != null && headerInfos.size() > 0) {
+ if (headerInfos != null && !headerInfos.isEmpty()) {
bodyParts = new ArrayList<>();
for (MessagePartInfo part : b.getInput().getMessageParts()) {
bodyParts.add(part.getName().getLocalPart());
@@ -279,7 +279,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (b.getOutput() != null) {
List<String> bodyParts = null;
List<SoapHeaderInfo> headerInfos = b.getOutput().getExtensors(SoapHeaderInfo.class);
- if (headerInfos != null && headerInfos.size() > 0) {
+ if (headerInfos != null && !headerInfos.isEmpty()) {
bodyParts = new ArrayList<>();
for (MessagePartInfo part : b.getOutput().getMessageParts()) {
bodyParts.add(part.getName().getLocalPart());
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
index 6e74c22..41470e2 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
@@ -104,7 +104,7 @@ public class SoapFault extends Fault {
}
private QName getRootSubCode() {
- return subCodes != null && subCodes.size() > 0 ? subCodes.get(0) : null;
+ return subCodes != null && !subCodes.isEmpty() ? subCodes.get(0) : null;
}
private void setRootSubCode(QName subCode) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
index 94e899b..ef143d4 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
@@ -65,7 +65,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
List<String> sa = headers.get(SoapBindingConstants.SOAP_ACTION);
- if (sa != null && sa.size() > 0) {
+ if (sa != null && !sa.isEmpty()) {
String action = sa.get(0);
if (action.startsWith("\"")) {
action = action.substring(1, action.length() - 1);
@@ -86,7 +86,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
// but skip searching if the start-info property is set
List<String> cts = CastUtils.cast((List<?>)(((Map<?, ?>)
message.get(AttachmentDeserializer.ATTACHMENT_PART_HEADERS)).get(Message.CONTENT_TYPE)));
- if (cts != null && cts.size() > 0) {
+ if (cts != null && !cts.isEmpty()) {
ct = cts.get(0);
start = ct.indexOf("action=");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
index 6cba304..3b63888 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
@@ -160,7 +160,7 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
parameters.put(mpi, object);
}
}
- if (parameters.size() > 0) {
+ if (!parameters.isEmpty()) {
message.setContent(List.class, parameters);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
index 840e6ab..8aca871 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
@@ -62,7 +62,7 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
private void checkContentEncoding(SoapMessage message, Map<String, List<String>> headers) {
List<String> contentEncodingList = headers.get(SoapJMSConstants.CONTENTENCODING_FIELD);
JMSFault jmsFault = null;
- if (contentEncodingList != null && contentEncodingList.size() > 0) {
+ if (contentEncodingList != null && !contentEncodingList.isEmpty()) {
String contentEncoding = contentEncodingList.get(0);
if (!"gzip".equals(contentEncoding)) {
jmsFault = JMSFaultFactory.createContentEncodingNotSupported(contentEncoding);
@@ -83,7 +83,7 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
*/
private void checkJMSMessageFormat(SoapMessage message, Map<String, List<String>> headers) {
List<String> mt = headers.get(SoapJMSConstants.JMS_MESSAGE_TYPE);
- if (mt != null && mt.size() > 0) {
+ if (mt != null && !mt.isEmpty()) {
String messageType = mt.get(0);
if (!"text".equals(messageType) && !"byte".equals(messageType)) {
JMSFault jmsFault = JMSFaultFactory.createUnsupportedJMSMessageFormatFault(messageType);
@@ -106,13 +106,13 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
String contentTypeAction = null;
List<String> ct = headers.get(SoapJMSConstants.CONTENTTYPE_FIELD);
List<String> sa = headers.get(SoapJMSConstants.SOAPACTION_FIELD);
- if (sa != null && sa.size() > 0) {
+ if (sa != null && !sa.isEmpty()) {
soapAction = sa.get(0);
if (soapAction != null && soapAction.startsWith("\"")) {
soapAction = soapAction.substring(1, soapAction.lastIndexOf("\""));
}
}
- if (ct != null && ct.size() > 0) {
+ if (ct != null && !ct.isEmpty()) {
contentType = ct.get(0);
}
if (contentType != null && contentType.indexOf("action=") != -1) {
@@ -148,15 +148,15 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
private void checkRequestURI(SoapMessage message, Map<String, List<String>> headers) {
List<String> ru = headers.get(SoapJMSConstants.REQUESTURI_FIELD);
JMSFault jmsFault = null;
- if (ru != null && ru.size() > 0) {
+ if (ru != null && !ru.isEmpty()) {
String requestURI = ru.get(0);
List<String> mr = headers.get(SoapJMSConstants.MALFORMED_REQUESTURI);
- if (mr != null && mr.size() > 0 && mr.get(0).equals("true")) {
+ if (mr != null && !mr.isEmpty() && mr.get(0).equals("true")) {
jmsFault = JMSFaultFactory.createMalformedRequestURIFault(requestURI);
}
List<String> trn = headers.get(SoapJMSConstants.TARGET_SERVICE_IN_REQUESTURI);
- if (trn != null && trn.size() > 0 && trn.get(0).equals("true")) {
+ if (trn != null && !trn.isEmpty() && trn.get(0).equals("true")) {
jmsFault = JMSFaultFactory.createTargetServiceNotAllowedInRequestURIFault();
}
} else {
@@ -177,7 +177,7 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
private void checkContentType(SoapMessage message, Map<String, List<String>> headers) {
List<String> ct = headers.get(SoapJMSConstants.CONTENTTYPE_FIELD);
JMSFault jmsFault = null;
- if (ct != null && ct.size() > 0) {
+ if (ct != null && !ct.isEmpty()) {
String contentType = ct.get(0);
if (!contentType.startsWith("text/xml")
&& !contentType.startsWith("application/soap+xml")
@@ -203,7 +203,7 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
*/
private void checkBindingVersion(SoapMessage message, Map<String, List<String>> headers) {
List<String> bv = headers.get(SoapJMSConstants.BINDINGVERSION_FIELD);
- if (bv != null && bv.size() > 0) {
+ if (bv != null && !bv.isEmpty()) {
String bindingVersion = bv.get(0);
if (!"1.0".equals(bindingVersion)) {
JMSFault jmsFault = JMSFaultFactory
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
index 582deb3..f27daf2 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
@@ -223,7 +223,7 @@ public class AegisDatabinding extends AbstractDataBinding {
aegisContext.setTypeCreationOptions(configuration);
}
- if (implMap.size() > 0) {
+ if (!implMap.isEmpty()) {
aegisContext.setBeanImplementationMap(implMap);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
index f3ded00..db435ac 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
@@ -350,7 +350,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
List<Element> mappings = findMappings(info.getType());
Class<?> relatedClass = TypeUtil.getTypeRelatedClass(info.getType());
- if (mapping != null || mappings.size() > 0) {
+ if (mapping != null || !mappings.isEmpty()) {
String typeNameAtt = null;
if (mapping != null) {
typeNameAtt = DOMUtils.getAttributeValueEmptyNull(mapping, "name");
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
index 16e90fc..99dd0de 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
@@ -174,7 +174,7 @@ public class JDOMStreamReader extends AbstractDOMStreamReader<Element, Integer>
@Override
protected void endElement() {
- if (namespaceStack.size() > 0) {
+ if (!namespaceStack.isEmpty()) {
prefix2decNs = namespaceStack.pop();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
index ebef316..599f5e8 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
@@ -76,7 +76,7 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
*/
public String selectAlternateAddress(List<String> alternates) {
String selected = null;
- if (alternates != null && alternates.size() > 0) {
+ if (alternates != null && !alternates.isEmpty()) {
selected = getNextAlternate(alternates);
Level level = getLogLevel();
if (LOG.isLoggable(level)) {
@@ -108,7 +108,7 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
*/
public Endpoint selectAlternateEndpoint(List<Endpoint> alternates) {
Endpoint selected = null;
- if (alternates != null && alternates.size() > 0) {
+ if (alternates != null && !alternates.isEmpty()) {
selected = getNextAlternate(alternates);
Level level = getLogLevel();
if (LOG.isLoggable(level)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
index 122cec5..9481101 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
@@ -345,7 +345,7 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
protected void setDataBindingProvider(ProviderFactory factory, Service s) {
List<ClassResourceInfo> cris = serviceFactory.getRealClassResourceInfo();
- if (getDataBinding() == null && cris.size() > 0) {
+ if (getDataBinding() == null && !cris.isEmpty()) {
org.apache.cxf.annotations.DataBinding ann =
cris.get(0).getServiceClass().getAnnotation(org.apache.cxf.annotations.DataBinding.class);
if (ann != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
index 697341a..9539f01 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
@@ -42,7 +42,7 @@ public class ProtocolHeadersImpl implements ProtocolHeaders {
public String getRequestHeaderValue(String name) {
List<String> values = getRequestHeader(name);
- return values.size() > 0 ? values.get(0) : null;
+ return !values.isEmpty() ? values.get(0) : null;
}
public MultivaluedMap<String, String> getRequestHeaders() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
index bafc333..b3e2ca3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
@@ -79,7 +79,7 @@ public class MultipartBody {
}
public Attachment getRootAttachment() {
- return atts.size() > 0 ? atts.get(0) : null;
+ return !atts.isEmpty() ? atts.get(0) : null;
}
public Attachment getAttachment(String contentId) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index 221c25a..aa64910 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -107,7 +107,7 @@ public class RequestImpl implements Request {
matchingVars.add(var);
}
}
- if (matchingVars.size() > 0) {
+ if (!matchingVars.isEmpty()) {
addVaryHeader(varyValues);
Collections.sort(matchingVars, new VariantComparator());
return matchingVars.get(0);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
index ea04001..ce1cc2d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
@@ -78,11 +78,11 @@ public class VariantListBuilderImpl extends VariantListBuilder {
}
private void addVariants() {
- if (mediaTypes.size() > 0) {
+ if (!mediaTypes.isEmpty()) {
handleMediaTypes();
- } else if (languages.size() > 0) {
+ } else if (!languages.isEmpty()) {
handleLanguages(null);
- } else if (encodings.size() > 0) {
+ } else if (!encodings.isEmpty()) {
for (String enc : encodings) {
variants.add(new Variant(null, (Locale)null, enc));
}
@@ -91,9 +91,9 @@ public class VariantListBuilderImpl extends VariantListBuilder {
private void handleMediaTypes() {
for (MediaType type : mediaTypes) {
- if (languages.size() > 0) {
+ if (!languages.isEmpty()) {
handleLanguages(type);
- } else if (encodings.size() > 0) {
+ } else if (!encodings.isEmpty()) {
for (String enc : encodings) {
variants.add(new Variant(type, (Locale)null, enc));
}
@@ -105,7 +105,7 @@ public class VariantListBuilderImpl extends VariantListBuilder {
private void handleLanguages(MediaType type) {
for (Locale lang : languages) {
- if (encodings.size() > 0) {
+ if (!encodings.isEmpty()) {
for (String enc : encodings) {
variants.add(new Variant(type, lang, enc));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index d8c35e9..01aa8c9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -872,7 +872,7 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
XmlJavaTypeAdapter adapter) throws JAXBException {
List<?> theList = getList();
boolean adapterChecked = false;
- if (theList.size() > 0) {
+ if (!theList.isEmpty()) {
Object first = theList.get(0);
if (first instanceof Element) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
index 190574c..c3ca9fd 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
@@ -386,7 +386,7 @@ public class RequestDispatcherProvider extends AbstractConfigurableProvider
}
List<PathSegment> segments = ui.getPathSegments();
- if (segments.size() > 0) {
+ if (!segments.isEmpty()) {
doSetRequestParameters(request, segments.get(segments.size() - 1).getMatrixParameters());
}
doSetRequestParameters(request, ui.getQueryParameters());
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index fe57120..d65e451 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -357,7 +357,7 @@ public final class ServerProviderFactory extends ProviderFactory {
}
public void applyDynamicFeatures(List<ClassResourceInfo> list) {
- if (dynamicFeatures.size() > 0) {
+ if (!dynamicFeatures.isEmpty()) {
for (ClassResourceInfo cri : list) {
doApplyDynamicFeatures(cri);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index 29a1855..90c6a1b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -464,7 +464,7 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
}
List<PathSegment> segments = ui.getPathSegments();
- if (segments.size() > 0) {
+ if (!segments.isEmpty()) {
setTransformParameters(templ, segments.get(segments.size() - 1).getMatrixParameters());
}
setTransformParameters(templ, ui.getQueryParameters());
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
index b764e25..fbdbac4 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
@@ -145,7 +145,7 @@ public class JAASAuthenticationFilter implements ContainerRequestFilter {
StringBuilder sb = new StringBuilder();
List<String> authHeader = headers.getRequestHeader(HttpHeaders.AUTHORIZATION);
- if (authHeader != null && authHeader.size() > 0) {
+ if (authHeader != null && !authHeader.isEmpty()) {
// should HttpHeadersImpl do it ?
String[] authValues = StringUtils.split(authHeader.get(0), " ");
if (authValues.length > 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index bf1f40f..1ad1fe9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -211,7 +211,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
list.add(theLoc);
}
}
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
bean.setSchemaLocations(list);
}
}
@@ -250,7 +250,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
}
}
}
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
if (OUT_INTERCEPTORS_PARAM.equals(paramName)) {
bean.setOutInterceptors(list);
} else if (OUT_FAULT_INTERCEPTORS_PARAM.equals(paramName)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index c52a984..a990c22 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -610,7 +610,7 @@ public final class InjectionUtils {
value.put(memberKey, entry.getValue());
}
- if (parsedValues.size() > 0) {
+ if (!parsedValues.isEmpty()) {
for (Map.Entry<String, MultivaluedMap<String, String>> entry : parsedValues.entrySet()) {
String memberKey = entry.getKey();
@@ -999,7 +999,7 @@ public final class InjectionUtils {
paramValuesMap, false, decoded, pathParam, message);
} else {
String result = null;
- if (paramValues.size() > 0) {
+ if (!paramValues.isEmpty()) {
boolean isLast = pathParam == ParameterType.PATH ? true : false;
result = isLast ? paramValues.get(paramValues.size() - 1)
: paramValues.get(0);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 415c8ca..f3643f9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -209,7 +209,7 @@ public final class JAXRSUtils {
types = ((AbstractConfigurableProvider)provider).getProduceMediaTypes();
}
if (types != null) {
- values = types.size() > 0 ? types.toArray(new String[types.size()])
+ values = !types.isEmpty() ? types.toArray(new String[types.size()])
: new String[]{"*/*"};
}
}
@@ -906,7 +906,7 @@ public final class JAXRSUtils {
boolean decode) {
List<PathSegment> segments = JAXRSUtils.getPathSegments(
(String)m.get(Message.REQUEST_URI), decode);
- if (segments.size() > 0) {
+ if (!segments.isEmpty()) {
MultivaluedMap<String, String> params = new MetadataMap<String, String>();
for (PathSegment ps : segments) {
MultivaluedMap<String, String> matrix = ps.getMatrixParameters();
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
index 7f8541b..ce71701 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
@@ -147,7 +147,7 @@ public final class AttachmentUtils {
}
}
- return infos.size() > 0 ? infos.get(0) : null;
+ return !infos.isEmpty() ? infos.get(0) : null;
}
public static List<Attachment> getMatchingAttachments(Multipart id,
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index a1be6e7..7752e6d 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -451,7 +451,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
if (executor != null) {
serverFactory.getServiceFactory().setExecutor(executor);
}
- if (handlers.size() > 0) {
+ if (!handlers.isEmpty()) {
serverFactory.addHandlers(handlers);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
index b83e511..502a0f9 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
@@ -278,7 +278,7 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
if (wsdlDocumentLocation != null
|| interfaceName != null
|| serviceName != null
- || (metadata != null && metadata.size() > 0)) {
+ || (metadata != null && !metadata.isEmpty())) {
writer.writeStartElement(JAXWSAConstants.WSA_PREFIX, JAXWSAConstants.WSA_METADATA_NAME,
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
index a2fa342..075d683 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
@@ -103,7 +103,7 @@ public class JaxWsImplementorInfo {
String namespace = null;
// serviceName cannot be specified on SEI so check impl class only
- if (wsAnnotations.size() > 0) {
+ if (!wsAnnotations.isEmpty()) {
int offset = 1;
if (seiClass == null) {
offset = 0;
@@ -148,7 +148,7 @@ public class JaxWsImplementorInfo {
String name = null;
// portName cannot be specified on SEI so check impl class only
- if (wsAnnotations.size() > 0) {
+ if (!wsAnnotations.isEmpty()) {
int offset = 1;
if (seiClass == null) {
offset = 0;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
index 5d09217..7923ff5 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
@@ -184,7 +184,7 @@ public class JaxWsServiceFactoryBean extends ReflectionServiceFactoryBean {
features.add(new RespectBindingFeature(respectBinding.enabled()));
}
- if (features.size() > 0) {
+ if (!features.isEmpty()) {
wsFeatures = features;
if (setWsFeatures != null) {
wsFeatures.addAll(setWsFeatures);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index bcae789..bf503fe 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -367,7 +367,7 @@ public class DynamicClientFactory {
}
List<File> srcFiles = FileUtils.getFilesRecurse(src, ".+\\.java$");
- if (srcFiles.size() > 0 && !compileJavaSrc(classPath.toString(), srcFiles, classes.toString())) {
+ if (!srcFiles.isEmpty() && !compileJavaSrc(classPath.toString(), srcFiles, classes.toString())) {
LOG.log(Level.SEVERE, new Message("COULD_NOT_COMPILE_SRC", LOG, wsdlUrl).toString());
}
FileUtils.removeDir(src);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
index 4c3ab48..ca34be5 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
@@ -83,7 +83,7 @@ public class JsSimpleDomNode extends ScriptableObject {
public Object jsGet_firstChild() {
establishChildren();
- if (children.size() > 0)
+ if (!children.isEmpty())
return children.get(0);
else
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 864a3fe..e34de1a 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -397,7 +397,7 @@ public class WadlGeneratorTest extends Assert {
}
private void checkGrammarsWithLinks(Element appElement, List<String> links) {
- assertTrue(links.size() > 0);
+ assertTrue(!links.isEmpty());
List<Element> grammarEls = DOMUtils.getChildrenWithName(appElement, WadlGenerator.WADL_NS,
"grammars");
assertEquals(1, grammarEls.size());
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/StreamingAsyncSubscriber.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/StreamingAsyncSubscriber.java b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/StreamingAsyncSubscriber.java
index cd1b91f..1571973 100644
--- a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/StreamingAsyncSubscriber.java
+++ b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/StreamingAsyncSubscriber.java
@@ -88,7 +88,7 @@ public class StreamingAsyncSubscriber<T> extends AbstractAsyncSubscriber<T> {
if (openTag != null) {
writer.getEntityStream().write(StringUtils.toBytesUTF8(openTag));
}
- while (!completed || queue.size() > 0) {
+ while (!completed || !queue.isEmpty()) {
try {
T bean = queue.poll(pollTimeout, TimeUnit.MILLISECONDS);
if (bean != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java
index 2f7082c..52dc444 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java
@@ -145,7 +145,7 @@ public final class SearchUtils {
String tableAlias,
List<String> columns) {
sb.append("SELECT ");
- if (columns != null && columns.size() > 0) {
+ if (columns != null && !columns.isEmpty()) {
for (int i = 0; i < columns.size(); i++) {
sb.append(columns.get(i));
if (i + 1 < columns.size()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
----------------------------------------------------------------------
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 b7ab474..df0da4f 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
@@ -187,7 +187,7 @@ public class AbstractAuthFilter {
}
}
- if (permissions.size() > 0 && matchingPermissions.isEmpty()) {
+ if (!permissions.isEmpty() && matchingPermissions.isEmpty()) {
String message = "Client has no valid permissions";
LOG.warning(message);
throw new OAuthProblemException(message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
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 f9dbaed..e7def27 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
@@ -435,7 +435,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
* one to start, or it is now one containing only the single handler
* that was there to begin with.
*/
- if (handlers != null && handlers.size() > 0) {
+ if (handlers != null && !handlers.isEmpty()) {
for (Handler h : handlers) {
// Filtering out the jetty default handler
// which should not be added at this point.
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
index 8b6b8f8..2e9e1c0 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
@@ -96,7 +96,7 @@ public class JettyHTTPServerEngineFactoryBeanDefinitionParser
// parser the engine list
List<Object> list =
getRequiredElementsList(element, ctx, new QName(HTTP_JETTY_NS, "engine"), bean);
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
bean.addPropertyValue("enginesList", list);
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineFactoryBeanDefinitionParser.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineFactoryBeanDefinitionParser.java
index c809299..210b673 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineFactoryBeanDefinitionParser.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineFactoryBeanDefinitionParser.java
@@ -96,7 +96,7 @@ public class NettyHttpServerEngineFactoryBeanDefinitionParser
// parser the engine list
List<Object> list =
getRequiredElementsList(element, ctx, new QName(HTTP_NETTY_SERVER_NS, "engine"), bean);
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
bean.addPropertyValue("enginesList", list);
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
index 8d84863..bc6ffb9 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
@@ -96,7 +96,7 @@ public class UndertowHTTPServerEngineFactoryBeanDefinitionParser
// parser the engine list
List<Object> list =
getRequiredElementsList(element, ctx, new QName(HTTP_UNDERTOW_NS, "engine"), bean);
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
bean.addPropertyValue("enginesList", list);
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
index 35ab7cc..8c2708b 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
@@ -51,7 +51,7 @@ public class Cookies {
maintainSession = MessageUtils.getContextualBoolean(message, Message.MAINTAIN_SESSION, false);
//If we have any cookies and we are maintaining sessions, then use them
- if (maintainSession && sessionCookies.size() > 0) {
+ if (maintainSession && !sessionCookies.isEmpty()) {
new Headers(message).writeSessionCookies(sessionCookies);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index a7c2e6f..10b53fc 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -570,7 +570,7 @@ public abstract class HTTPConduit
return true;
} else if (!HTTP_GET_METHOD.equals(httpMethod)) {
MessageContentsList objs = MessageContentsList.getContentsList(message);
- if (objs != null && objs.size() > 0) {
+ if (objs != null && !objs.isEmpty()) {
Object obj = objs.get(0);
if (obj.getClass() != String.class
|| (obj.getClass() == String.class && ((String)obj).length() > 0)) {
@@ -997,7 +997,7 @@ public abstract class HTTPConduit
for (Map.Entry<String, List<String>> head : headers.entrySet()) {
if ("Location".equalsIgnoreCase(head.getKey())) {
List<String> locs = head.getValue();
- if (locs != null && locs.size() > 0) {
+ if (locs != null && !locs.isEmpty()) {
String location = locs.get(0);
if (location != null) {
return location;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index d8d227f..7f18f95 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -505,7 +505,7 @@ final class JMSMessageUtils {
if (headers != null) {
List<String> action = headers.remove("SOAPAction");
- if (action != null && action.size() > 0) {
+ if (action != null && !action.isEmpty()) {
soapAction = action.get(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
----------------------------------------------------------------------
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 fb25582..4d7ad7e 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
@@ -525,7 +525,7 @@ public class MAPAggregatorImpl extends MAPAggregator {
if (aim == null || aim.size() == 0) {
missingWsaHeader = true;
}
- if (aim != null && aim.size() > 0) {
+ if (aim != null && !aim.isEmpty()) {
missingWsaHeader = true;
QName[] types = new QName[] {
MetadataConstants.ADDRESSING_ASSERTION_QNAME,
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
index 3e77e7f..f84db06 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
@@ -504,7 +504,7 @@ public class RMManager {
@PreDestroy
public void shutdown() {
// shutdown remaining endpoints
- if (reliableEndpoints.size() > 0) {
+ if (!reliableEndpoints.isEmpty()) {
LOG.log(Level.FINE,
"Shutting down RMManager with {0} remaining endpoints.",
new Object[] {Integer.valueOf(reliableEndpoints.size())});
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java
index 6562ae4..e9b887b 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java
@@ -60,7 +60,7 @@ public class SequenceMonitor {
}
public synchronized long getLastArrivalTime() {
- if (receiveTimes.size() > 0) {
+ if (!receiveTimes.isEmpty()) {
return receiveTimes.get(receiveTimes.size() - 1).longValue();
}
return 0;
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/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 1635e1c..f99809a 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
@@ -905,7 +905,7 @@ public class RMTxStore implements RMStore {
newCols.add(col);
}
}
- if (newCols.size() > 0) {
+ if (!newCols.isEmpty()) {
// need to add the new columns
if (LOG.isLoggable(Level.FINE)) {
LOG.log(Level.FINE, "Table " + tableName + " needs additional columns");
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java
index bd401a2..8ced4c4 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java
@@ -202,10 +202,10 @@ public class RMSoapInInterceptor extends AbstractSoapInterceptor {
}
}
}
- if (acks.size() > 0) {
+ if (!acks.isEmpty()) {
rmps.setAcks(acks);
}
- if (requested.size() > 0) {
+ if (!requested.isEmpty()) {
rmps.setAcksRequested(requested);
}
} catch (JAXBException ex) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
index d2518fb..d0e7018 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
@@ -136,7 +136,7 @@ public class RedeliveryQueueImpl implements RedeliveryQueue {
}
LOG.fine("Completed purging redeliver candidates.");
}
- if (purged.size() > 0) {
+ if (!purged.isEmpty()) {
RMStore store = manager.getStore();
if (null != store) {
store.removeMessages(seq.getIdentifier(), purged, false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 11d319a..cf6e3b8 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -199,7 +199,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
}
LOG.fine("Completed purging resend candidates.");
}
- if (purged.size() > 0) {
+ if (!purged.isEmpty()) {
RMStore store = manager.getStore();
if (null != store) {
store.removeMessages(sid, purged, true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 33c2932..a1c794e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -174,7 +174,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
message.getExchange().remove(SecurityConstants.TOKEN);
List<WSHandlerResult> results =
CastUtils.cast((List<?>)message.get(WSHandlerConstants.RECV_RESULTS));
- if (results != null && results.size() > 0) {
+ if (results != null && !results.isEmpty()) {
parseHandlerResults(results.get(0), message, ais);
}
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
index b862b9c..9bd568e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
@@ -173,7 +173,7 @@ public class KerberosTokenInterceptorProvider extends AbstractPolicyInterceptorP
if (!isRequestor(message)) {
List<WSHandlerResult> results =
CastUtils.cast((List<?>)message.get(WSHandlerConstants.RECV_RESULTS));
- if (results != null && results.size() > 0) {
+ if (results != null && !results.isEmpty()) {
parseHandlerResults(results.get(0), message, aim, ais);
}
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index d6c6d71..ea11515 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -205,7 +205,7 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa
private boolean hasAttachments(SoapMessage mc) {
final Collection<org.apache.cxf.message.Attachment> attachments = mc.getAttachments();
- return attachments != null && attachments.size() > 0;
+ return attachments != null && !attachments.isEmpty();
}
public Set<String> getAfter() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index 8a9d97d..43fd622 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -293,7 +293,7 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
private boolean hasAttachments(SoapMessage mc) {
final Collection<org.apache.cxf.message.Attachment> attachments = mc.getAttachments();
- return attachments != null && attachments.size() > 0;
+ return attachments != null && !attachments.isEmpty();
}
private void configureActions(SoapMessage mc, boolean doDebug,
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 11f92f7..d515f8b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -2182,7 +2182,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
// prepare a SignatureConfirmation token
WSSecSignatureConfirmation wsc = new WSSecSignatureConfirmation(secHeader);
wsc.setIdAllocator(wssConfig.getIdAllocator());
- if (signatureActions.size() > 0) {
+ if (!signatureActions.isEmpty()) {
for (WSSecurityEngineResult wsr : signatureActions) {
byte[] sigVal = (byte[]) wsr.get(WSSecurityEngineResult.TAG_SIGNATURE_VALUE);
wsc.setSignatureValue(sigVal);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 7fdda59..3ae627a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -326,7 +326,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
}
WSSecBase encrBase = null;
- if (encryptionToken != null && encrParts.size() > 0) {
+ if (encryptionToken != null && !encrParts.isEmpty()) {
encrBase = doEncryption(wrapper, encrParts, true);
handleEncryptedSignedHeaders(encrParts, sigParts);
}
@@ -336,7 +336,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
}
try {
- if (sigParts.size() > 0) {
+ if (!sigParts.isEmpty()) {
if (initiatorWrapper != null && isRequestor()) {
doSignature(initiatorWrapper, sigParts, attached);
} else if (!isRequestor()) {
@@ -437,7 +437,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
List<WSEncryptionPart> encrParts,
boolean externalRef) {
//Do encryption
- if (recToken != null && recToken.getToken() != null && encrParts.size() > 0) {
+ if (recToken != null && recToken.getToken() != null && !encrParts.isEmpty()) {
AbstractToken encrToken = recToken.getToken();
assertPolicy(recToken);
assertPolicy(encrToken);
http://git-wip-us.apache.org/repos/asf/cxf/blob/003fb1e7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
index efd7203..037a2cb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
@@ -173,7 +173,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler {
assertTokenWrapper(recipientSignatureToken);
assertToken(recipientSignatureToken.getToken());
}
- if (recipientSignatureToken != null && sigs.size() > 0) {
+ if (recipientSignatureToken != null && !sigs.isEmpty()) {
doSignature(recipientSignatureToken, sigs);
}
}
@@ -289,7 +289,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler {
addSupportingTokens();
- if (encryptionToken != null && encrParts.size() > 0) {
+ if (encryptionToken != null && !encrParts.isEmpty()) {
if (isRequestor()) {
encrParts.addAll(encryptedTokensList);
} else {
@@ -319,7 +319,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler {
sigParts.add(part);
}
- if (sigParts.size() > 0) {
+ if (!sigParts.isEmpty()) {
if (initiatorWrapper != null && isRequestor()) {
doSignature(initiatorWrapper, sigParts);
} else if (!isRequestor()) {
@@ -350,7 +350,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler {
List<SecurePart> encrParts,
boolean externalRef) throws SOAPException {
//Do encryption
- if (recToken != null && recToken.getToken() != null && encrParts.size() > 0) {
+ if (recToken != null && recToken.getToken() != null && !encrParts.isEmpty()) {
AbstractToken encrToken = recToken.getToken();
AlgorithmSuite algorithmSuite = abinding.getAlgorithmSuite();