You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/12/05 21:39:01 UTC
(cxf) branch 3.6.x-fixes updated (7b5cd2f4f3 -> af1ed6c89e)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 7b5cd2f4f3 [CXF-9185]NPE after removing a property from a JAX-RS Client (#2769)
new 6661c6f4cf Bump org.webjars:swagger-ui from 5.30.2 to 5.30.3 (#2757)
new 78939ea195 Fix org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduitTest throwing java.lang.NullPointerException (#2759)
new 95871851d7 Add timeout to DeliveryAssuranceOnewayTest since it always hangs on Windows build (#2760)
new 40b99d3f2b Bump org.apache.maven.plugins:maven-war-plugin from 3.5.0 to 3.5.1 (#2762)
new 5fbce1cc53 Bump org.apache.maven.plugins:maven-resources-plugin from 3.3.1 to 3.4.0 (#2766)
new de5b4c2690 Bump github/codeql-action from 4.31.4 to 4.31.5 (#2761)
new d275d9741b Bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.1 to 3.8.0 (#2768)
new 49d02db083 Bump org.apache.maven.plugins:maven-source-plugin from 3.3.1 to 3.4.0 (#2767)
new 08aa877666 Bump net.sourceforge.pmd:pmd-core from 7.18.0 to 7.19.0 (#2764)
new 2da709e873 Bump net.sourceforge.pmd:pmd-java from 7.18.0 to 7.19.0 (#2763)
new b212aae85c Fix PMD violations
new 74168906f5 Fix PMD violations
new af1ed6c89e Recording .gitmergeinfo Changes
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/codeql-analysis.yml | 4 ++--
.gitmergeinfo | 6 +++++
.../cxf/common/xmlschema/XmlSchemaUtils.java | 12 +++++-----
.../java/org/apache/cxf/helpers/ServiceUtils.java | 10 ++++-----
.../org/apache/cxf/service/model/SchemaInfo.java | 4 ++--
.../release/samples/jax_rs/graalvm_basic/pom.xml | 3 ++-
.../src/main/release/samples/jaxws_graalvm/pom.xml | 3 ++-
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 6 ++---
pom.xml | 8 +++----
.../CorbaStreamOutEndingInterceptor.java | 4 ++--
.../interceptors/CorbaStreamOutInterceptor.java | 4 ++--
.../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 +-
.../cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 16 ++++++-------
.../jose/jaxrs/AbstractJweJsonWriterProvider.java | 2 +-
.../security/jose/jwe/AbstractJweEncryption.java | 2 +-
.../jwe/AbstractWrapKeyEncryptionAlgorithm.java | 2 +-
.../jose/jwe/DirectKeyEncryptionAlgorithm.java | 2 +-
.../cxf/rs/security/jose/jwe/JweJsonConsumer.java | 4 ++--
.../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 4 ++--
.../oauth2/filters/OAuthRequestFilter.java | 2 +-
.../org/apache/cxf/transport/http/HTTPConduit.java | 5 +++--
.../http/policy/impl/ClientPolicyCalculator.java | 2 +-
.../https/httpclient/PublicSuffixMatcher.java | 2 +-
.../factory/ReflectionServiceFactoryBean.java | 2 +-
.../cxf/sts/operation/TokenIssueOperation.java | 4 ++--
.../sts/token/provider/DefaultSubjectProvider.java | 4 ++--
.../provider/jwt/DefaultJWTClaimsProvider.java | 6 ++---
.../forked/dispatch/HugeResponseInterceptor.java | 6 ++---
.../systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../systest/ws/rm/DeliveryAssuranceOnewayTest.java | 26 +++++++++++-----------
.../ws/policy/JavaFirstUriDomainExpression.java | 6 ++---
.../ws/policy/UriDomainFactoryBeanListener.java | 2 +-
.../internal/DefaultServiceBuilderFactory.java | 4 ++--
.../jaxws/processor/internal/ServiceProcessor.java | 6 ++---
.../internal/annotator/BindingAnnotator.java | 6 ++---
.../internal/annotator/SoapBindingAnnotator.java | 6 ++---
44 files changed, 125 insertions(+), 116 deletions(-)
(cxf) 10/13: Bump net.sourceforge.pmd:pmd-java from 7.18.0 to 7.19.0 (#2763)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2da709e87389c1ff1870db39f43efea3607298f4
Author: dependabot[bot] <49...@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] <su...@github.com>
* Fix PMD violations
---------
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Co-authored-by: Andriy Redko <dr...@gmail.com>
(cherry picked from commit c2643d04fe5940b5a8d6407a91bd087164beb8a1)
(cherry picked from commit 5954368100c747f20dfccf9f3968fac943094ede)
(cherry picked from commit 1102a6308dff8334b2e64febe4cd6bb17e40c763)
# Conflicts:
# tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
---
.../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 364e9bbdbd..65280bd144 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -440,7 +440,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 13adfb7898..7186d433e4 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 7a4324ee22..c8814636ac 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 ed79eed301..a1797e2eb8 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 6ac7ca6a9e..689976df52 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
@@ -79,7 +79,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;
}
@@ -241,17 +241,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 4b8e5b397a..39b9ea3d9d 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
@@ -55,9 +55,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";
}
}
@@ -77,9 +77,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 00b35f5ba1..b5397a67b1 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 2153c64795..048f13ef56 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 f41975e729..85a8b3acba 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 70441089c2..c53032d21d 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
@@ -1299,7 +1299,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 483e5843d7..61a248a5ce 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(javax.jws.soap.SOAPBinding.Style.RPC)) {
+ if (jm.getSoapStyle() == javax.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 88d33e76cd..d76b29da3c 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
@@ -40,11 +40,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
@@ -87,7 +87,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 058ea588fb..ce83644b16 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
@@ -38,20 +38,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));
(cxf) 03/13: Add timeout to DeliveryAssuranceOnewayTest since it always hangs on Windows build (#2760)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 95871851d76162c003b2f1d788545c968aabcbea
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Nov 30 19:03:34 2025 -0500
Add timeout to DeliveryAssuranceOnewayTest since it always hangs on Windows build (#2760)
(cherry picked from commit 4b05865687b71e9df5efdbbced99838b880cd94f)
(cherry picked from commit 313e9d55e0464015db9877d130f3ed5b28748910)
(cherry picked from commit f8cdd894cbb948df1f059ebfa1b4c077fe6adff1)
---
.../systest/ws/rm/DeliveryAssuranceOnewayTest.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index c4ef9ed152..46304b7f06 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -92,12 +92,12 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
Thread.sleep(100);
}
- @Test
+ @Test(timeout = 60000)
public void testAtLeastOnce() throws Exception {
testOnewayAtLeastOnce(null);
}
- @Test
+ @Test(timeout = 60000)
public void testAtLeastOnceAsyncExecutor() throws Exception {
testOnewayAtLeastOnce(Executors.newSingleThreadExecutor());
}
@@ -138,12 +138,12 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
assertTrue("Too few messages " + actualArgs.size(), callArgs.length <= actualArgs.size());
}
- @Test
+ @Test(timeout = 60000)
public void testAtMostOnce() throws Exception {
testOnewayAtMostOnce(null);
}
- @Test
+ @Test(timeout = 60000)
public void testAtMostOnceAsyncExecutor() throws Exception {
testOnewayAtMostOnce(Executors.newSingleThreadExecutor());
}
@@ -172,12 +172,12 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
}
- @Test
+ @Test(timeout = 60000)
public void testExactlyOnce() throws Exception {
testOnewayExactlyOnce(null);
}
- @Test
+ @Test(timeout = 60000)
public void testExactlyOnceAsyncExecutor() throws Exception {
testOnewayExactlyOnce(Executors.newSingleThreadExecutor());
}
@@ -211,12 +211,12 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
}
- @Test
+ @Test(timeout = 60000)
public void testInOrder() throws Exception {
testOnewayInOrder(null);
}
- @Test
+ @Test(timeout = 60000)
public void testInOrderAsyncExecutor() throws Exception {
testOnewayInOrder(Executors.newSingleThreadExecutor());
}
@@ -243,7 +243,7 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
}
}
- @Test
+ @Test(timeout = 60000)
public void testOnewayAtLeastOnceInOrderDelay() throws Exception {
int numMessages = 4;
init("org/apache/cxf/systest/ws/rm/atleastonce-inorder.xml", null);
@@ -281,12 +281,12 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
}
}
- @Test
+ @Test(timeout = 60000)
public void testAtMostOnceInOrder() throws Exception {
testOnewayAtMostOnceInOrder(null);
}
- @Test
+ @Test(timeout = 60000)
public void testAtMostOnceInOrderAsyncExecutor() throws Exception {
testOnewayAtMostOnceInOrder(Executors.newSingleThreadExecutor());
}
@@ -314,12 +314,12 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase
}
}
- @Test
+ @Test(timeout = 60000)
public void testExactlyOnceInOrder() throws Exception {
testOnewayExactlyOnceInOrder(null);
}
- @Test
+ @Test(timeout = 60000)
public void testExactlyOnceInOrderAsyncExecutor() throws Exception {
testOnewayExactlyOnceInOrder(Executors.newSingleThreadExecutor());
}
(cxf) 12/13: Fix PMD violations
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 74168906f5ddd839e6ba29c12e6352c94e0d0ef2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Dec 4 22:23:06 2025 -0500
Fix PMD violations
(cherry picked from commit 76f9ef641d05ffda30f7f61aa30cb15d6c530bd8)
(cherry picked from commit 1bc18148444fd86101fb98bc804658f7efb4d1d8)
(cherry picked from commit 076f03a6fe2eab33ecb0db7fe152f1baed5b79cc)
---
.../interceptors/CorbaStreamOutEndingInterceptor.java | 4 ++--
.../corba/interceptors/CorbaStreamOutInterceptor.java | 4 ++--
.../apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java | 16 ++++++++--------
.../cxf/rs/security/jose/jwe/AbstractJweEncryption.java | 2 +-
.../jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java | 2 +-
.../security/jose/jwe/DirectKeyEncryptionAlgorithm.java | 2 +-
.../apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java | 4 ++--
.../org/apache/cxf/rs/security/jose/jwk/JwkUtils.java | 4 ++--
.../rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +-
.../http/policy/impl/ClientPolicyCalculator.java | 2 +-
.../transport/https/httpclient/PublicSuffixMatcher.java | 2 +-
.../apache/cxf/sts/operation/TokenIssueOperation.java | 4 ++--
.../cxf/sts/token/provider/DefaultSubjectProvider.java | 4 ++--
.../sts/token/provider/jwt/DefaultJWTClaimsProvider.java | 6 +++---
.../forked/dispatch/HugeResponseInterceptor.java | 6 +++---
.../processor/internal/DefaultServiceBuilderFactory.java | 4 ++--
16 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
index 5c92fb6064..1bee4e78d7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
@@ -120,7 +120,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
QName paramName;
final CorbaObjectHandler obj;
- if (param.getMode().equals(ModeType.OUT)) {
+ if (param.getMode() == ModeType.OUT) {
if (wrap) {
paramName = new QName(wrapNSUri, param.getName());
} else {
@@ -180,7 +180,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
QName idlType = param.getIdltype();
QName paramName;
final CorbaObjectHandler obj;
- if (param.getMode().equals(ModeType.IN)) {
+ if (param.getMode() == ModeType.IN) {
if (wrap) {
paramName = new QName(wrapNSUri, param.getName());
} else {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
index 7ec3265b32..d125d3334c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
@@ -77,7 +77,7 @@ public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message>
List<ArgType> params = new ArrayList<>();
for (Iterator<ParamType> iter = paramTypes.iterator(); iter.hasNext();) {
ParamType param = iter.next();
- if (!param.getMode().equals(ModeType.OUT)) {
+ if (param.getMode() != ModeType.OUT) {
params.add(param);
}
}
@@ -100,7 +100,7 @@ public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message>
}
for (Iterator<ParamType> iter = paramTypes.iterator(); iter.hasNext();) {
ParamType param = iter.next();
- if (!param.getMode().equals(ModeType.IN)) {
+ if (param.getMode() != ModeType.IN) {
params.add(param);
}
}
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index 7778b48897..8db0865aba 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -368,10 +368,10 @@ public class FiqlParserTest {
assertEquals(2, conditions.size());
PrimitiveStatement st1 = conditions.get(0).getStatement();
PrimitiveStatement st2 = conditions.get(1).getStatement();
- assertTrue((ConditionType.EQUALS.equals(st1.getCondition())
- && ConditionType.GREATER_THAN.equals(st2.getCondition()))
- || (ConditionType.EQUALS.equals(st2.getCondition())
- && ConditionType.GREATER_THAN.equals(st1.getCondition())));
+ assertTrue((ConditionType.EQUALS == st1.getCondition()
+ && ConditionType.GREATER_THAN == st2.getCondition())
+ || (ConditionType.EQUALS == st2.getCondition()
+ && ConditionType.GREATER_THAN == st1.getCondition()));
assertTrue(filter.isMet(new Condition("amichalec", 12, new Date())));
assertTrue(filter.isMet(new Condition("ami", 12, new Date())));
@@ -397,10 +397,10 @@ public class FiqlParserTest {
PrimitiveStatement st1 = conditions.get(0).getStatement();
PrimitiveStatement st2 = conditions.get(1).getStatement();
- assertTrue((ConditionType.EQUALS.equals(st1.getCondition())
- && ConditionType.GREATER_THAN.equals(st2.getCondition()))
- || (ConditionType.EQUALS.equals(st2.getCondition())
- && ConditionType.GREATER_THAN.equals(st1.getCondition())));
+ assertTrue((ConditionType.EQUALS == st1.getCondition()
+ && ConditionType.GREATER_THAN == st2.getCondition())
+ || (ConditionType.EQUALS == st2.getCondition()
+ && ConditionType.GREATER_THAN == st1.getCondition()));
assertTrue(filter.isMet(new Condition("ami", 0, new Date())));
assertTrue(filter.isMet(new Condition("foo", 20, null)));
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index ebfb01c499..616412af4e 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -177,7 +177,7 @@ public abstract class AbstractJweEncryption implements JweEncryptionProvider {
if (jweInHeaders != null) {
if (jweInHeaders.getKeyEncryptionAlgorithm() != null
&& (getKeyAlgorithm() == null
- || !getKeyAlgorithm().equals(jweInHeaders.getKeyEncryptionAlgorithm()))) {
+ || getKeyAlgorithm() != jweInHeaders.getKeyEncryptionAlgorithm())) {
LOG.warning("Invalid key encryption algorithm");
throw new JweException(JweException.Error.INVALID_KEY_ALGORITHM);
}
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java
index 4f67106b11..ae135579fa 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractWrapKeyEncryptionAlgorithm.java
@@ -90,7 +90,7 @@ public abstract class AbstractWrapKeyEncryptionAlgorithm implements KeyEncryptio
}
protected void checkAlgorithms(JweHeaders headers) {
KeyAlgorithm providedAlgo = headers.getKeyEncryptionAlgorithm();
- if (providedAlgo != null && !providedAlgo.equals(algorithm)) {
+ if (providedAlgo != null && providedAlgo != algorithm) {
LOG.warning("Invalid key encryption algorithm: " + providedAlgo);
throw new JweException(JweException.Error.INVALID_KEY_ALGORITHM);
}
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java
index 584390a363..c828afa80d 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/DirectKeyEncryptionAlgorithm.java
@@ -31,7 +31,7 @@ public class DirectKeyEncryptionAlgorithm implements KeyEncryptionProvider {
}
protected void checkKeyEncryptionAlgorithm(JweHeaders headers) {
KeyAlgorithm keyAlgo = headers.getKeyEncryptionAlgorithm();
- if (keyAlgo != null && !KeyAlgorithm.DIRECT.equals(keyAlgo)) {
+ if (keyAlgo != null && KeyAlgorithm.DIRECT != keyAlgo) {
LOG.warning("Key encryption algorithm header is set");
throw new JweException(JweException.Error.INVALID_KEY_ALGORITHM);
}
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
index 5111d5dca0..71b86e2ad3 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
@@ -92,9 +92,9 @@ public class JweJsonConsumer {
Map<String, Object> recipientProps) {
for (Map.Entry<JweJsonEncryptionEntry, JweHeaders> entry : recipientsMap.entrySet()) {
KeyAlgorithm keyAlgo = entry.getValue().getKeyEncryptionAlgorithm();
- if (keyAlgo != null && keyAlgo.equals(jwe.getKeyAlgorithm())
+ if (keyAlgo != null && keyAlgo == jwe.getKeyAlgorithm()
|| keyAlgo == null
- && (jwe.getKeyAlgorithm() == null || KeyAlgorithm.DIRECT.equals(jwe.getKeyAlgorithm()))) {
+ && (jwe.getKeyAlgorithm() == null || KeyAlgorithm.DIRECT == jwe.getKeyAlgorithm())) {
if (recipientProps != null
&& !entry.getValue().asMap().entrySet().containsAll(recipientProps.entrySet())) {
continue;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
index 824f918641..d255923712 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
@@ -565,7 +565,7 @@ public final class JwkUtils {
}
public static void includeCertChain(JsonWebKey jwk, JoseHeaders headers, String algo) {
- if (KeyType.RSA.equals(jwk.getKeyType())) {
+ if (KeyType.RSA == jwk.getKeyType()) {
List<String> chain = CastUtils.cast((List<?>)jwk.getProperty(JsonWebKey.X509_CHAIN));
if (chain != null) {
headers.setX509Chain(chain);
@@ -574,7 +574,7 @@ public final class JwkUtils {
}
public static void includePublicKey(JsonWebKey jwk, JoseHeaders headers, String algo) {
- if (KeyType.RSA.equals(jwk.getKeyType())) {
+ if (KeyType.RSA == jwk.getKeyType()) {
JsonWebKey jwkPublic = JwkUtils.fromRSAPublicKey(JwkUtils.toRSAPublicKey(jwk), algo);
if (jwk.getKeyId() != null) {
jwkPublic.setKeyId(jwk.getKeyId());
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
index ecd7c14a86..4a01595780 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java
@@ -150,7 +150,7 @@ public class OAuthRequestFilter extends AbstractAccessTokenValidator
LOG.warning(message);
throw ExceptionUtils.toForbiddenException(null, null);
}
- if (am != null && !am.equals(accessTokenV.getTokenSubject().getAuthenticationMethod())) {
+ if (am != null && am != accessTokenV.getTokenSubject().getAuthenticationMethod()) {
String message = "The token has been authorized by the resource owner "
+ "using an unsupported authentication method";
LOG.warning(message);
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
index 0f1f05804e..ee41dc0f4a 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/impl/ClientPolicyCalculator.java
@@ -227,7 +227,7 @@ public class ClientPolicyCalculator implements PolicyCalculator<HTTPClientPolicy
if (compatible) {
compatible &= !p1.isSetProxyServerType() || !p2.isSetProxyServerType()
- || p1.getProxyServerType().equals(p2.getProxyServerType());
+ || p1.getProxyServerType() == p2.getProxyServerType();
}
if (compatible) {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
index 9c615fef62..d01d6b0ea0 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
@@ -96,7 +96,7 @@ public final class PublicSuffixMatcher {
if (domainType == null) {
return false;
}
- return expectedType == null || domainType.equals(expectedType);
+ return expectedType == null || domainType == expectedType;
}
private boolean hasRule(final String rule, final DomainType expectedType) {
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 b2f2da189b..1094d3ed5a 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
@@ -228,9 +228,9 @@ public class TokenIssueOperation extends AbstractOperation implements IssueOpera
if (tokenResponse == null) {
LOG.fine("No Token Validator has been found that can handle this token");
- } else if (validateTarget.getState().equals(STATE.INVALID)) {
+ } else if (validateTarget.getState() == STATE.INVALID) {
throw new STSException("Incoming token is invalid", STSException.REQUEST_FAILED);
- } else if (validateTarget.getState().equals(STATE.VALID)) {
+ } else if (validateTarget.getState() == STATE.VALID) {
processValidToken(providerParameters, validateTarget, tokenResponse);
} else {
//[TODO] Add plugin for validation out-of-band
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
index 49f6f37e80..de7ae784e3 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
@@ -130,12 +130,12 @@ public class DefaultSubjectProvider implements SubjectProvider {
//if validation was successful, the principal was set in ReceivedToken
if (providerParameters.getTokenRequirements().getOnBehalfOf() != null) {
ReceivedToken receivedToken = providerParameters.getTokenRequirements().getOnBehalfOf();
- if (receivedToken.getState().equals(STATE.VALID)) {
+ if (receivedToken.getState() == STATE.VALID) {
principal = receivedToken.getPrincipal();
}
} else if (providerParameters.getTokenRequirements().getValidateTarget() != null) {
ReceivedToken receivedToken = providerParameters.getTokenRequirements().getValidateTarget();
- if (receivedToken.getState().equals(STATE.VALID)) {
+ if (receivedToken.getState() == STATE.VALID) {
principal = receivedToken.getPrincipal();
}
} else {
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java
index 9f02af9332..a06a58a6d4 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java
@@ -132,12 +132,12 @@ public class DefaultJWTClaimsProvider implements JWTClaimsProvider {
//if validation was successful, the principal was set in ReceivedToken
if (providerParameters.getTokenRequirements().getOnBehalfOf() != null) {
ReceivedToken receivedToken = providerParameters.getTokenRequirements().getOnBehalfOf();
- if (receivedToken.getState().equals(STATE.VALID)) {
+ if (receivedToken.getState() == STATE.VALID) {
principal = receivedToken.getPrincipal();
}
} else if (providerParameters.getTokenRequirements().getValidateTarget() != null) {
ReceivedToken receivedToken = providerParameters.getTokenRequirements().getValidateTarget();
- if (receivedToken.getState().equals(STATE.VALID)) {
+ if (receivedToken.getState() == STATE.VALID) {
principal = receivedToken.getPrincipal();
}
} else {
@@ -271,7 +271,7 @@ public class DefaultJWTClaimsProvider implements JWTClaimsProvider {
if (providerParameters.getTokenRequirements().getActAs() != null) {
ReceivedToken receivedToken = providerParameters.getTokenRequirements().getActAs();
- if (receivedToken.getState().equals(STATE.VALID)) {
+ if (receivedToken.getState() == STATE.VALID) {
claims.setClaim("ActAs", receivedToken.getPrincipal().getName());
}
}
diff --git a/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java b/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java
index 6da4941ba7..925e303081 100644
--- a/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java
+++ b/systests/forked/src/test/java/org/apache/cxf/systests/forked/dispatch/HugeResponseInterceptor.java
@@ -40,9 +40,9 @@ public class HugeResponseInterceptor extends AbstractPhaseInterceptor<Message> {
}
public void handleMessage(Message message) throws Fault {
- if (type.equals(ResponseInterceptorType.overflow)) {
+ if (type == ResponseInterceptorType.overflow) {
throw new StackOverflowError();
- } else if (type.equals(ResponseInterceptorType.ElementLevelThreshold)) {
+ } else if (type == ResponseInterceptorType.ElementLevelThreshold) {
InputStream is = message.getContent(InputStream.class);
if (is != null) {
CachedOutputStream bos = new CachedOutputStream();
@@ -59,7 +59,7 @@ public class HugeResponseInterceptor extends AbstractPhaseInterceptor<Message> {
throw new Fault(e);
}
}
- } else if (type.equals(ResponseInterceptorType.ElementCountThreshold)) {
+ } else if (type == ResponseInterceptorType.ElementCountThreshold) {
InputStream is = message.getContent(InputStream.class);
if (is != null) {
CachedOutputStream bos = new CachedOutputStream();
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
index deea27bf57..9c2d33a33a 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
@@ -49,9 +49,9 @@ public final class DefaultServiceBuilderFactory extends ServiceBuilderFactory {
throw new ToolException("Unsupported databinding: " + dbn);
}
final AbstractServiceFactory builder;
- if (Style.Jaxws.equals(s)) {
+ if (Style.Jaxws == s) {
builder = new JaxwsServiceBuilder();
- } else if (Style.Simple.equals(s)) {
+ } else if (Style.Simple == s) {
builder = new SimpleServiceBuilder();
} else {
throw new ToolException("Unsupported frontend style: " + s);
(cxf) 08/13: Bump org.apache.maven.plugins:maven-source-plugin from 3.3.1 to 3.4.0 (#2767)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 49d02db0833040f08b690aa83b45efa424b162a7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Dec 2 21:48:29 2025 -0500
Bump org.apache.maven.plugins:maven-source-plugin from 3.3.1 to 3.4.0 (#2767)
Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/apache/maven-source-plugin/releases)
- [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.3.1...maven-source-plugin-3.4.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-source-plugin
dependency-version: 3.4.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 52e8937007182622045eb9aad1dc95527c675a7c)
(cherry picked from commit b90cf3c871abc76219d1a4cded63639f6e7cb7fe)
(cherry picked from commit f0fdd178b09424a1deefd896f871b366c327beab)
# Conflicts:
# pom.xml
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c0fca403cc..25c8b65e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -501,7 +501,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 09/13: Bump net.sourceforge.pmd:pmd-core from 7.18.0 to 7.19.0 (#2764)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 08aa8776662a819c589553f9f6ae3653f96d08c9
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Dec 4 08:13:40 2025 -0500
Bump net.sourceforge.pmd:pmd-core from 7.18.0 to 7.19.0 (#2764)
Bumps [net.sourceforge.pmd:pmd-core](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-core
dependency-version: 7.19.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit e2179922acb8e54e098e149d5394acd8f47a0d6f)
(cherry picked from commit 61d17b3867c1853a3fef03f165c3c1bfbfd97bca)
(cherry picked from commit 562f62465553a3621cfc3d63af57ba99c61b4b26)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bfdb6e2e61..364e9bbdbd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -435,7 +435,7 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
- <version>7.18.0</version>
+ <version>7.19.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
(cxf) 06/13: Bump github/codeql-action from 4.31.4 to 4.31.5 (#2761)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit de5b4c26909fc6606646997f8b3fbe7d202d172a
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Dec 1 15:29:34 2025 -0500
Bump github/codeql-action from 4.31.4 to 4.31.5 (#2761)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.4 to 4.31.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e12f0178983d466f2f6028f5cc7a6d786fd97f4b...fdbfb4d2750291e159f0156def62b853c2798ca2)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-version: 4.31.5
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit dc62303d8d784f0598dccae652bd424bc4fdf21c)
# Conflicts:
# .github/workflows/scorecards.yml
(cherry picked from commit d872aca1803445dbcf043e21db64a34936687684)
(cherry picked from commit 391c2ef883529380f0feaf1a07e8b5ac612726cf)
---
.github/workflows/codeql-analysis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 196e7d0b98..d30ac08f6b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -61,7 +61,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
+ uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
with:
languages: ${{ matrix.language }}
#config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -89,4 +89,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
+ uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
(cxf) 13/13: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit af1ed6c89e4cee3c457fe33261b7bd3559b1c638
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Dec 5 16:15:36 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 03642b9b74..ca6189fc1a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -335,6 +335,7 @@ B d4b1b8ce444edb91926614a005d9f4e870024dc0
B d6c8e85bc2ebbef56ef4f0fd58ebed9e14a2a64e
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B d86c13439f67f97afd459332a54ec7ffc69043c0
+B dad97067514546525e3b1bb47eb6ffe9ffc706cc
B db1e32ac267e5806a70e616c6fb6408f50403b7e
B dba3f290e0b001e21bb080a7765b4f66d44911c8
B dc5e818f5a8387e7009bc4471b5a032428cfb3cc
@@ -505,6 +506,7 @@ M 101a68321fde9a9595dc15c799259025e0386cf4
M 1031e01e42414fe381392174337903f22c83f692
M 1065c7070bb7d3ba5f1553956a308b316b2ea572
M 106c310b39a5b611cd8b8c2de4b4070e1d52b498
+M 1102a6308dff8334b2e64febe4cd6bb17e40c763
M 110bd2a076463ed4b8736996772e171bda14c3e6
M 113ea3f0e8c6265d472244492d6f71eb023dffa0
M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
@@ -555,6 +557,7 @@ M 1931627bce92559e1bc0cf585163b4c9c921fcf7
M 1933463bdd34bf6d399f1958bd2f30b92f341e66
M 194f6aa32321826865293527d0511a965a83fd54
M 195291092a2c1dca795949f351e49f07a623087b
+M 1982b80cfc8f52a056567c5c1bf253bf533ac974
M 1a26597eece270dac44750f7e279bc343789e331
M 1a3bc6682d9ed7c59068e7abb312a7af847e50fa
M 1a434023d792e352785e0be73815560fcae1efe4
@@ -728,6 +731,7 @@ M 38f782eb80c647fc36da50509bb234401d04202c
M 38f8930b0364511a19da1eef8c1ea11b2c408dfa
M 39040bb671a74dac32c113f6d4905313733ed3c9
M 391a2bad740614b3bebe80f2ff8e16afe3eeb262
+M 391c2ef883529380f0feaf1a07e8b5ac612726cf
M 393ff9a2af51fbdadf02ee2eda6f0419ea78ba3b
M 3955e2b35d903906ba0d215bf3f683feec907cc5
M 396c32848ff70a7cd77bfcd5ea80a4b4abe4c20c
@@ -1734,7 +1738,9 @@ M f03c3b0f9dccf7ebec8e1016247091cb363344ea
M f05bdcfeafebdbe93c6d189514e084ae1d40cac0
M f0cd0884594281e630c83de19d9ec7d6a45046bb
M f0f14c3480bf3898e8c02b9185c20cf88d37c0b4
+M f0fdd178b09424a1deefd896f871b366c327beab
M f125c9675817f159fbfc565c0cc0406dcfd2216d
+M f1481ea5118d6961d37fbcfef0edc5e32d4a7f8f
M f1ae3569ecd72800d9114278a0d4aa4a2d2370b7
M f1b299cf408b827ab962fa94004c38682d3777f4
M f289b9d06e71fb3c01b677871bd666755bf080df
(cxf) 01/13: Bump org.webjars:swagger-ui from 5.30.2 to 5.30.3 (#2757)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6661c6f4cfa7a15b2d3eafb8554c9cd0245a00b9
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Nov 28 08:51:16 2025 -0500
Bump org.webjars:swagger-ui from 5.30.2 to 5.30.3 (#2757)
Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.30.2 to 5.30.3.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.30.2...v5.30.3)
---
updated-dependencies:
- dependency-name: org.webjars:swagger-ui
dependency-version: 5.30.3
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 7ad896896c39bd6966adcec83500134a20368add)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit e6162adabcf402c7082ccf67519959e9f7a68978)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit f1481ea5118d6961d37fbcfef0edc5e32d4a7f8f)
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 3790964248..f521c86ecc 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
<cxf.jetty10.version>10.0.26</cxf.jetty10.version>
<cxf.netty.version>4.1.128.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>5.30.2</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.30.3</cxf.swagger.ui.version>
<cxf.tika.version>2.9.1</cxf.tika.version>
<cxf.tomcat.version>9.0.112</cxf.tomcat.version>
<cxf.lucene.version>9.12.3</cxf.lucene.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index cee0be0f34..bfdb6e2e61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
<cxf.spring.security.version>5.8.16</cxf.spring.security.version>
<cxf.spring.version>5.3.39</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>5.30.2</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.30.3</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.41</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.15</cxf.swagger2.version>
<cxf.swagger2.guava.version>32.1.3-jre</cxf.swagger2.guava.version>
(cxf) 02/13: Fix org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduitTest throwing java.lang.NullPointerException (#2759)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 78939ea1954dff799924955d1bedaad87295878d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 29 07:57:01 2025 -0500
Fix org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduitTest throwing java.lang.NullPointerException (#2759)
(cherry picked from commit 9b23b07f481aaa2c2e42398c90f6c0d2d28123bc)
(cherry picked from commit 64b81fe1510fdd1c250f48100ac3201646932163)
(cherry picked from commit ba9b61cfcf5bcd9b729d3d261fa609c80d864ccb)
---
.../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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 7b185d5931..dcbcc8fbe5 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
@@ -1733,8 +1733,9 @@ public abstract class HTTPConduit
//not going to be resending or anything, clear out the stuff in the out message
//to free memory
outMessage.removeContent(OutputStream.class);
- if (cachingForRetransmission && cachedStream != null) {
- cachedStream.close();
+ final CacheAndWriteOutputStream stream = cachedStream;
+ if (cachingForRetransmission && stream != null) {
+ stream.close();
}
cachedStream = null;
}
(cxf) 11/13: Fix PMD violations
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b212aae85c4770739a4d4906bfd647647ecbca1a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Dec 4 22:12:39 2025 -0500
Fix PMD violations
(cherry picked from commit 48c3f5dcc9ce5e882f20994fc01859b7e931b93d)
(cherry picked from commit 22662d5d062c7bd4a2e359d3684c0ffe7af4f27d)
(cherry picked from commit a6c8be89d7576e39e1168bf8ac821c5e5a6e449d)
---
core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
index a39ee94d44..b79c462e91 100644
--- a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
@@ -47,13 +47,13 @@ public final class ServiceUtils {
SchemaValidationType validationType = getSchemaValidationType(message);
boolean isRequestor = MessageUtils.isRequestor(message);
- if (SchemaValidationType.REQUEST.equals(validationType)) {
+ if (SchemaValidationType.REQUEST == validationType) {
if (isRequestor) {
validationType = SchemaValidationType.OUT;
} else {
validationType = SchemaValidationType.IN;
}
- } else if (SchemaValidationType.RESPONSE.equals(validationType)) {
+ } else if (SchemaValidationType.RESPONSE == validationType) {
if (isRequestor) {
validationType = SchemaValidationType.IN;
} else {
@@ -61,9 +61,9 @@ public final class ServiceUtils {
}
}
- return validationType.equals(type)
- || ((SchemaValidationType.IN.equals(type) || SchemaValidationType.OUT.equals(type))
- && SchemaValidationType.BOTH.equals(validationType));
+ return validationType == type
+ || ((SchemaValidationType.IN == type || SchemaValidationType.OUT == type)
+ && SchemaValidationType.BOTH == validationType);
}
/**
* A convenience method to check for schema validation config in the message context, and then in the service model.
(cxf) 07/13: Bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.1 to 3.8.0 (#2768)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d275d9741b264c7fee86ad4ed9e5dbcc3f8ecf56
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Dec 2 21:48:05 2025 -0500
Bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.1 to 3.8.0 (#2768)
Bumps [org.apache.maven.plugins:maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/apache/maven-assembly-plugin/releases)
- [Commits](https://github.com/apache/maven-assembly-plugin/compare/maven-assembly-plugin-3.7.1...v3.8.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-assembly-plugin
dependency-version: 3.8.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 3cf4e23f30592491beeab63e3eab44c5ce547818)
(cherry picked from commit 5aed1d65b5bd0c3fcaccb50dafe6464256659511)
(cherry picked from commit 9f5bcd7859bd878fba88f06eb0326be5c600c47c)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a8763e8927..c0fca403cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,7 +550,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.7.1</version>
+ <version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>