This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1102a6308dff8334b2e64febe4cd6bb17e40c763
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Dec 4 20:36:56 2025 -0500
Bump net.sourceforge.pmd:pmd-java from 7.18.0 to 7.19.0 (#2763)
* Bump net.sourceforge.pmd:pmd-java from 7.18.0 to 7.19.0
Bumps [net.sourceforge.pmd:pmd-java](https://github.com/pmd/pmd) from
7.18.0 to 7.19.0.
- [Release notes](https://github.com/pmd/pmd/releases)
-
[Commits](https://github.com/pmd/pmd/compare/pmd_releases/7.18.0...pmd_releases/7.19.0)
---
updated-dependencies:
- dependency-name: net.sourceforge.pmd:pmd-java
dependency-version: 7.19.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix PMD violations
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andriy Redko <[email protected]>
(cherry picked from commit c2643d04fe5940b5a8d6407a91bd087164beb8a1)
(cherry picked from commit 5954368100c747f20dfccf9f3968fac943094ede)
---
.../cxf/common/xmlschema/XmlSchemaUtils.java | 12 +++++------
.../org/apache/cxf/service/model/SchemaInfo.java | 4 ++--
parent/pom.xml | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBase.java | 2 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 2 +-
.../org/apache/cxf/jaxb/JAXBSchemaInitializer.java | 2 +-
.../apache/cxf/jaxrs/impl/ConfigurableImpl.java | 8 ++++----
.../soap/JaxWsSoapBindingConfiguration.java | 8 ++++----
.../jaxws/support/JaxWsServiceConfiguration.java | 24 +++++++++++-----------
.../cxf/jaxws/support/JaxWsServiceFactoryBean.java | 2 +-
.../org/apache/cxf/javascript/AttributeInfo.java | 2 +-
.../jose/jaxrs/AbstractJweJsonWriterProvider.java | 2 +-
.../factory/ReflectionServiceFactoryBean.java | 2 +-
.../systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../ws/policy/JavaFirstUriDomainExpression.java | 6 +++---
.../ws/policy/UriDomainFactoryBeanListener.java | 2 +-
.../jaxws/processor/internal/ServiceProcessor.java | 6 +++---
.../internal/annotator/BindingAnnotator.java | 6 +++---
.../internal/annotator/SoapBindingAnnotator.java | 6 +++---
19 files changed, 50 insertions(+), 50 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
index aa19c97811..2fd7704678 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
@@ -280,13 +280,13 @@ public final class XmlSchemaUtils {
if (attribute.isRef()) {
throw new RuntimeException("isElementNameQualified on element with
ref=");
}
- if (attribute.getForm().equals(XmlSchemaForm.QUALIFIED)) {
+ if (attribute.getForm() == XmlSchemaForm.QUALIFIED) {
return true;
}
- if (attribute.getForm().equals(XmlSchemaForm.UNQUALIFIED)) {
+ if (attribute.getForm() == XmlSchemaForm.UNQUALIFIED) {
return false;
}
- return
schema.getAttributeFormDefault().equals(XmlSchemaForm.QUALIFIED);
+ return schema.getAttributeFormDefault() == XmlSchemaForm.QUALIFIED;
}
/**
@@ -331,13 +331,13 @@ public final class XmlSchemaUtils {
if (element.isRef()) {
throw new RuntimeException("isElementNameQualified on element with
ref=");
}
- if (element.getForm().equals(XmlSchemaForm.QUALIFIED)) {
+ if (element.getForm() == XmlSchemaForm.QUALIFIED) {
return true;
}
- if (element.getForm().equals(XmlSchemaForm.UNQUALIFIED)) {
+ if (element.getForm() == XmlSchemaForm.UNQUALIFIED) {
return false;
}
- return schema.getElementFormDefault().equals(XmlSchemaForm.QUALIFIED);
+ return schema.getElementFormDefault() == XmlSchemaForm.QUALIFIED;
}
/**
diff --git a/core/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
b/core/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
index b051926aa6..5beae22290 100644
--- a/core/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
@@ -142,8 +142,8 @@ public final class SchemaInfo extends
AbstractPropertiesHolder {
public void setSchema(XmlSchema schema) {
this.schema = schema;
- isElementQualified =
schema.getElementFormDefault().equals(XmlSchemaForm.QUALIFIED);
- isAttributeQualified =
schema.getAttributeFormDefault().equals(XmlSchemaForm.QUALIFIED);
+ isElementQualified = schema.getElementFormDefault() ==
XmlSchemaForm.QUALIFIED;
+ isAttributeQualified = schema.getAttributeFormDefault() ==
XmlSchemaForm.QUALIFIED;
}
public String getSystemId() {
diff --git a/parent/pom.xml b/parent/pom.xml
index ecdf41a6f7..b096311fd2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -437,7 +437,7 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
- <version>7.18.0</version>
+ <version>7.19.0</version>
</dependency>
</dependencies>
<configuration>
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index 2629f1b91c..9cd9f21b09 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -135,7 +135,7 @@ public abstract class JAXBDataBase {
protected boolean isOutputMessage(AbstractMessageContainer
messageContainer) {
if (messageContainer instanceof MessageInfo) {
- return
MessageInfo.Type.OUTPUT.equals(((MessageInfo)messageContainer).getType());
+ return MessageInfo.Type.OUTPUT ==
((MessageInfo)messageContainer).getType();
}
return false;
}
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index ef77be1ca5..4f2d443586 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -413,7 +413,7 @@ public final class JAXBEncoderDecoder {
}
XmlAccessorOrder xmlAccessorOrder =
cls.getAnnotation(XmlAccessorOrder.class);
- if (xmlAccessorOrder != null &&
xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL)) {
+ if (xmlAccessorOrder != null && xmlAccessorOrder.value() ==
XmlAccessOrder.ALPHABETICAL) {
Collections.sort(combinedMembers, new Comparator<Member>() {
public int compare(Member m1, Member m2) {
return m1.getName().compareTo(m2.getName());
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index fe791ef245..7ccfbe0133 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -592,7 +592,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
}
- if (xmlAccessorOrder != null &&
xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL)
+ if (xmlAccessorOrder != null && xmlAccessorOrder.value() ==
XmlAccessOrder.ALPHABETICAL
&& propertyOrder == null) {
sort(seq);
}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
index da8f1a986c..2ee35b65a0 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
@@ -78,7 +78,7 @@ public class ConfigurableImpl<C extends Configurable<C>>
implements Configurable
this.config = config instanceof ConfigurationImpl
? (ConfigurationImpl)config : new ConfigurationImpl(config);
this.classLoader = Thread.currentThread().getContextClassLoader();
- restrictedContractTypes =
RuntimeType.CLIENT.equals(config.getRuntimeType()) ?
RESTRICTED_CLASSES_IN_CLIENT
+ restrictedContractTypes = RuntimeType.CLIENT ==
config.getRuntimeType() ? RESTRICTED_CLASSES_IN_CLIENT
: RESTRICTED_CLASSES_IN_SERVER;
}
@@ -240,17 +240,17 @@ public class ConfigurableImpl<C extends Configurable<C>>
implements Configurable
RuntimeType providerRuntime = providerConstraint.value();
// need to check (1) whether the registration is occurring in the
specified runtime type
// and (2) does the provider implement an invalid interface based
on the constrained runtime type
- if (!providerRuntime.equals(currentRuntime)) {
+ if (providerRuntime != currentRuntime) {
LOG.warning("Provider " + provider + " cannot be registered in
this " + currentRuntime
+ " runtime because it is constrained to " +
providerRuntime + " runtimes.");
return false;
}
- Class<?>[] restrictedInterfaces =
RuntimeType.CLIENT.equals(providerRuntime) ? RESTRICTED_CLASSES_IN_CLIENT
+ Class<?>[] restrictedInterfaces = RuntimeType.CLIENT ==
providerRuntime ? RESTRICTED_CLASSES_IN_CLIENT
: RESTRICTED_CLASSES_IN_SERVER;
for (Class<?> restrictedContract : restrictedInterfaces) {
if (restrictedContract.isAssignableFrom(providerClass)) {
- RuntimeType opposite =
RuntimeType.CLIENT.equals(providerRuntime) ? RuntimeType.SERVER
+ RuntimeType opposite = RuntimeType.CLIENT ==
providerRuntime ? RuntimeType.SERVER
: RuntimeType.CLIENT;
LOG.warning("Provider " + providerClass.getName() + " is
invalid - it is constrained to "
+ providerRuntime + " runtimes but implements a " +
opposite + " interface ");
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
index bd49fc7c96..1e56f3b162 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
@@ -54,9 +54,9 @@ public class JaxWsSoapBindingConfiguration extends
SoapBindingConfiguration {
public String getStyle() {
SOAPBinding sb = getServiceClass().getAnnotation(SOAPBinding.class);
if (sb != null) {
- if (sb.style().equals(Style.DOCUMENT)) {
+ if (sb.style() == Style.DOCUMENT) {
return "document";
- } else if (sb.style().equals(Style.RPC)) {
+ } else if (sb.style() == Style.RPC) {
return "rpc";
}
}
@@ -76,9 +76,9 @@ public class JaxWsSoapBindingConfiguration extends
SoapBindingConfiguration {
public String getUse() {
SOAPBinding sb = getServiceClass().getAnnotation(SOAPBinding.class);
if (sb != null) {
- if (sb.use().equals(Use.LITERAL)) {
+ if (sb.use() == Use.LITERAL) {
return "literal";
- } else if (sb.use().equals(Use.ENCODED)) {
+ } else if (sb.use() == Use.ENCODED) {
return "encoded";
}
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
index 8c4884bbc8..794e903362 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
@@ -521,7 +521,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
WebParam webParam = getWebParam(method, j);
- return webParam == null || (webParam.mode().equals(Mode.IN) ||
webParam.mode().equals(Mode.INOUT));
+ return webParam == null || (webParam.mode() == Mode.IN ||
webParam.mode() == Mode.INOUT);
}
private WebResult getWebResult(Method method) {
@@ -537,7 +537,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
WebParam webParam = getWebParam(method, j);
- if (webParam != null && (webParam.mode().equals(Mode.OUT) ||
webParam.mode().equals(Mode.INOUT))) {
+ if (webParam != null && (webParam.mode() == Mode.OUT ||
webParam.mode() == Mode.INOUT)) {
return Boolean.TRUE;
}
return method.getParameterTypes()[j] == Holder.class;
@@ -552,7 +552,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
WebParam webParam = getWebParam(method, j);
- if (webParam != null && webParam.mode().equals(Mode.INOUT)) {
+ if (webParam != null && webParam.mode() == Mode.INOUT) {
return Boolean.TRUE;
}
return Boolean.FALSE;
@@ -758,11 +758,11 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
SOAPBinding ann = m.getAnnotation(SOAPBinding.class);
if (ann != null) {
- if (ann.style().equals(Style.RPC)) {
+ if (ann.style() == Style.RPC) {
Message message = new Message("SOAPBinding_MESSAGE_RPC", LOG,
m.getName());
throw new Fault(new JaxWsConfigurationException(message));
}
- return !(ann.parameterStyle().equals(ParameterStyle.BARE));
+ return ann.parameterStyle() != ParameterStyle.BARE;
}
return isWrapped();
@@ -772,7 +772,7 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
public Boolean isWrapped() {
SOAPBinding ann =
implInfo.getEndpointClass().getAnnotation(SOAPBinding.class);
if (ann != null) {
- return !(ann.parameterStyle().equals(ParameterStyle.BARE) ||
ann.style().equals(Style.RPC));
+ return !(ann.parameterStyle() == ParameterStyle.BARE ||
ann.style() == Style.RPC);
}
return null;
}
@@ -800,13 +800,13 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
private boolean isDocumentBare(Method method) {
SOAPBinding ann = method.getAnnotation(SOAPBinding.class);
if (ann != null) {
- return ann.style().equals(SOAPBinding.Style.DOCUMENT)
- &&
ann.parameterStyle().equals(SOAPBinding.ParameterStyle.BARE);
+ return ann.style() == SOAPBinding.Style.DOCUMENT
+ && ann.parameterStyle() == SOAPBinding.ParameterStyle.BARE;
}
ann = implInfo.getEndpointClass().getAnnotation(SOAPBinding.class);
if (ann != null) {
- return ann.style().equals(SOAPBinding.Style.DOCUMENT)
- &&
ann.parameterStyle().equals(SOAPBinding.ParameterStyle.BARE);
+ return ann.style() == SOAPBinding.Style.DOCUMENT
+ && ann.parameterStyle() == SOAPBinding.ParameterStyle.BARE;
}
return false;
}
@@ -815,11 +815,11 @@ public class JaxWsServiceConfiguration extends
AbstractServiceConfiguration {
public Boolean isRPC(Method method) {
SOAPBinding ann = method.getAnnotation(SOAPBinding.class);
if (ann != null) {
- return ann.style().equals(SOAPBinding.Style.RPC);
+ return ann.style() == SOAPBinding.Style.RPC;
}
ann = implInfo.getEndpointClass().getAnnotation(SOAPBinding.class);
if (ann != null) {
- return ann.style().equals(SOAPBinding.Style.RPC);
+ return ann.style() == SOAPBinding.Style.RPC;
}
return super.isRPC(method);
}
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 9ee2e49d61..d041f8b5e6 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
@@ -502,7 +502,7 @@ public class JaxWsServiceFactoryBean extends
ReflectionServiceFactoryBean {
Class<?> seiClass = ii.getEndpointClass();
if (seiClass != null && seiClass.getPackage() != null) {
XmlSchema schema =
seiClass.getPackage().getAnnotation(XmlSchema.class);
- if (schema != null &&
XmlNsForm.QUALIFIED.equals(schema.elementFormDefault())) {
+ if (schema != null && XmlNsForm.QUALIFIED ==
schema.elementFormDefault()) {
setQualifyWrapperSchema(true);
}
}
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
index 7679b137e4..ad1c88cef6 100644
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
@@ -266,7 +266,7 @@ public final class AttributeInfo implements ItemInfo {
}
public boolean isOptional() {
- return !use.equals(XmlSchemaUse.REQUIRED);
+ return use != XmlSchemaUse.REQUIRED;
}
public void setDefaultValue(String value) {
diff --git
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
index 1b77075613..a5ca3e49de 100644
---
a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
+++
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
@@ -117,7 +117,7 @@ public class AbstractJweJsonWriterProvider {
ContentAlgorithm currentCtAlgo =
JweUtils.getContentEncryptionAlgorithm(m, props, ContentAlgorithm.A128GCM);
if (ctAlgo == null) {
ctAlgo = currentCtAlgo;
- } else if (currentCtAlgo != null && !ctAlgo.equals(currentCtAlgo))
{
+ } else if (currentCtAlgo != null && ctAlgo != currentCtAlgo) {
// ctAlgo must be the same for all the recipients
throw new
JweException(JweException.Error.INVALID_CONTENT_ALGORITHM);
}
diff --git
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index 1c95d15bb7..7b32e2691a 100644
---
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -1360,7 +1360,7 @@ public class ReflectionServiceFactoryBean extends
org.apache.cxf.service.factory
el.setSchemaType((XmlSchemaType)mpi.getXmlSchema());
- if
(schema.getElementFormDefault().equals(XmlSchemaForm.UNQUALIFIED)) {
+ if (schema.getElementFormDefault() ==
XmlSchemaForm.UNQUALIFIED) {
mpi.setConcreteName(new QName(null,
mpi.getName().getLocalPart()));
} else {
mpi.setConcreteName(mpi.getName());
diff --git
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
index 13a6b5919e..62794ed106 100644
---
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
+++
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
@@ -1298,7 +1298,7 @@ public abstract class AbstractTypeTestClient2 extends
AbstractTypeTestClient {
protected boolean equals(ExtColourEnum x, ExtColourEnum y) {
return (x.getAttrib1().equals(y.getAttrib1()))
&& (x.getAttrib2().equals(y.getAttrib2()))
- && (x.getValue().equals(y.getValue()));
+ && (x.getValue() == y.getValue());
}
@Test
public void testExtColourEnum() throws Exception {
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
index 939a2c0c2a..5dd38c7038 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
@@ -46,12 +46,12 @@ public class JavaFirstUriDomainExpression implements
DomainExpression {
if ("JavaFirstAttachmentPolicyService".equals(serviceName) &&
"usernamepassword".equals(url)) {
return
("doInputMessagePolicy".equals(bmi.getBindingOperation().getName().getLocalPart())
- &&
MessageInfo.Type.INPUT.equals(bmi.getMessageInfo().getType()))
+ && MessageInfo.Type.INPUT == bmi.getMessageInfo().getType())
||
("doOutputMessagePolicy".equals(bmi.getBindingOperation().getName().getLocalPart())
- &&
MessageInfo.Type.OUTPUT.equals(bmi.getMessageInfo().getType()));
+ && MessageInfo.Type.OUTPUT == bmi.getMessageInfo().getType());
} else if ("SslUsernamePasswordAttachmentService".equals(serviceName)
&& "sslusernamepassword".equals(url)) {
- return
MessageInfo.Type.INPUT.equals(bmi.getMessageInfo().getType());
+ return MessageInfo.Type.INPUT == bmi.getMessageInfo().getType();
} else {
return false;
}
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
index 1a2aa9664d..cd2b24669e 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java
@@ -31,7 +31,7 @@ public class UriDomainFactoryBeanListener implements
FactoryBeanListener {
@Override
public void handleEvent(Event ev, AbstractServiceFactoryBean factory,
Object... args) {
- if (ev.equals(Event.START_CREATE)) {
+ if (ev == Event.START_CREATE) {
// Remove original URIDomainExpressionBuilder to be replaced on
custom one
ExtensionManagerImpl orig =
(ExtensionManagerImpl)factory.getBus().getExtension(ExtensionManager.class);
List<String> names = new ArrayList<>();
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
index 4bed402469..01473c41c2 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
@@ -390,7 +390,7 @@ public class ServiceProcessor extends AbstractProcessor {
jm.setSoapStyle(jf.getSOAPStyle());
}
- if
(jm.getSoapStyle().equals(jakarta.jws.soap.SOAPBinding.Style.RPC)) {
+ if (jm.getSoapStyle() ==
jakarta.jws.soap.SOAPBinding.Style.RPC) {
jm.getAnnotationMap().remove("SOAPBinding");
}
@@ -587,7 +587,7 @@ public class ServiceProcessor extends AbstractProcessor {
if (extElement instanceof MIMEContent) {
MIMEContent mimeContent = (MIMEContent)extElement;
String mimeJavaType = getJavaTypeForMimeType(mPart);
- if (JavaType.Style.IN.equals(style)) {
+ if (JavaType.Style.IN == style) {
String paramName =
ProcessorUtil.mangleNameToVariableName(mimeContent.getPart());
JavaParameter jp = jm.getParameter(paramName);
if (jp == null) {
@@ -598,7 +598,7 @@ public class ServiceProcessor extends AbstractProcessor {
// jp.setType(mimeJavaType);
jp.setClassName(mimeJavaType);
}
- } else if (JavaType.Style.OUT.equals(style)) {
+ } else if (JavaType.Style.OUT == style) {
JavaType jp = null;
if (!"void".equals(jm.getReturn().getType())
&&
mimeContent.getPart().equals(jm.getReturn().getName())) {
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java
index e1a870c156..b18a6963c5 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java
@@ -39,11 +39,11 @@ public final class BindingAnnotator implements Annotator {
if (processBinding(intf)) {
JAnnotation bindingAnnotation = new JAnnotation(SOAPBinding.class);
- if (!SOAPBinding.Style.DOCUMENT.equals(intf.getSOAPStyle())) {
+ if (SOAPBinding.Style.DOCUMENT != intf.getSOAPStyle()) {
bindingAnnotation.addElement(new JAnnotationElement("style",
intf.getSOAPStyle()));
}
- if (!SOAPBinding.Use.LITERAL.equals(intf.getSOAPUse())) {
+ if (SOAPBinding.Use.LITERAL != intf.getSOAPUse()) {
bindingAnnotation.addElement(new JAnnotationElement("use",
intf.getSOAPUse()));
}
if (intf.getSOAPStyle() == SOAPBinding.Style.DOCUMENT
@@ -86,7 +86,7 @@ public final class BindingAnnotator implements Annotator {
&& method.getSoapStyle() != null) {
soapStyle = method.getSoapStyle();
}
- if (SOAPBinding.Style.DOCUMENT.equals(mStyle)) {
+ if (SOAPBinding.Style.DOCUMENT == mStyle) {
allRPC = false;
} else {
allDOC = false;
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
index 1afb382581..9917e357d4 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
@@ -37,20 +37,20 @@ public class SoapBindingAnnotator implements Annotator {
}
if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT) {
if (!method.isWrapperStyle()
- &&
!SOAPBinding.ParameterStyle.BARE.equals(method.getInterface().getSOAPParameterStyle()))
{
+ && SOAPBinding.ParameterStyle.BARE !=
method.getInterface().getSOAPParameterStyle()) {
JAnnotation bindingAnnotation = new
JAnnotation(SOAPBinding.class);
bindingAnnotation.addElement(new
JAnnotationElement("parameterStyle",
SOAPBinding.ParameterStyle.BARE));
method.addAnnotation("SOAPBinding", bindingAnnotation);
} else if (method.isWrapperStyle()
- &&
SOAPBinding.ParameterStyle.BARE.equals(method.getInterface().getSOAPParameterStyle()))
{
+ && SOAPBinding.ParameterStyle.BARE ==
method.getInterface().getSOAPParameterStyle()) {
JAnnotation bindingAnnotation = new
JAnnotation(SOAPBinding.class);
bindingAnnotation.addElement(new
JAnnotationElement("parameterStyle",
SOAPBinding.ParameterStyle.WRAPPED));
method.addAnnotation("SOAPBinding", bindingAnnotation);
}
- } else if
(!SOAPBinding.Style.RPC.equals(method.getInterface().getSOAPStyle())) {
+ } else if (SOAPBinding.Style.RPC !=
method.getInterface().getSOAPStyle()) {
JAnnotation bindingAnnotation = new JAnnotation(SOAPBinding.class);
bindingAnnotation.addElement(new JAnnotationElement("style",
SOAPBinding.Style.RPC));
