This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 58d8029e6ffdacaab35c46d531aac289002eacdf
Author: Daniel Kulp <d...@kulp.com>
AuthorDate: Wed Aug 30 18:26:55 2023 -0400
Re-enable checkstyle/pmd on master, fix all the issues so backporting
changes is easier
---
.../main/java/org/apache/cxf/helpers/NSDecl.java | 2 +-
.../jaxws/CxfJaxwsAutoConfiguration.java | 2 +
.../AbstractObservationClientProvider.java | 4 +-
.../micrometer/CxfObservationConventionUtil.java | 11 +++--
.../ObservationClientStartInterceptor.java | 5 ++-
.../micrometer/ObservationStartInterceptor.java | 7 ++--
.../jaxrs/AbstractJaxrsObservationConvention.java | 4 +-
.../jaxrs/ContainerRequestReceiverContext.java | 3 +-
...tainerRequestReceiverObservationConvention.java | 3 +-
.../ContainerRequestSenderObservationContext.java | 3 +-
...ontainerRequestSenderObservationConvention.java | 3 +-
...tainerRequestReceiverObservationConvention.java | 11 ++---
...ontainerRequestSenderObservationConvention.java | 8 ++--
.../jaxrs/JaxrsObservationDocumentation.java | 9 ++++-
.../jaxrs/ObservationClientProvider.java | 16 ++++----
.../jaxrs/ObservationContextProvider.java | 2 +-
.../micrometer/jaxrs/ObservationFeature.java | 6 +--
.../micrometer/jaxrs/ObservationProvider.java | 17 ++++----
.../micrometer/ObservationIntegrationTest.java | 4 +-
.../AbstractOpenTelemetryProvider.java | 2 +-
.../opentelemetry/OpenTelemetryFeature.java | 4 +-
.../opentelemetry/jaxrs/OpenTelemetryFeature.java | 7 ++--
parent/pom.xml | 47 ++++++++--------------
.../cxf/jaxrs/provider/CustomJaxbProvider.java | 2 +-
.../http/netty/client/NettyHttpClientRequest.java | 2 +-
.../netty/server/NettyHttpDestinationTest.java | 3 +-
.../java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 +-
.../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +-
.../cxf/sts/claims/LdapGroupClaimsHandler.java | 2 +-
.../apache/cxf/sts/claims/StaticClaimsHandler.java | 4 +-
.../sts/claims/StaticEndpointClaimsHandler.java | 4 +-
.../apache/cxf/sts/claims/mapper/ClaimUtils.java | 4 +-
.../org/apache/cxf/sts/event/map/EventMapper.java | 4 +-
.../provider/jwt/DefaultJWTClaimsProvider.java | 2 +-
.../sts/claims/mapper/JexlClaimsMapperTest.java | 7 ++--
.../cxf/sts/common/CustomAttributeProvider.java | 4 +-
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 4 +-
.../cdi/base/tomcat/AbstractTomcatServer.java | 2 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 4 +-
.../jaxrs/provider/CXFJaxbElementProvider.java | 2 +-
.../systest/dispatch/DispatchClientServerTest.java | 2 +-
.../org/apache/cxf/systest/jaxws/CXF7990Test.java | 2 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +-
.../systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../toolspec/parser/CommandLineParserTest.java | 2 +-
.../jaxws/customization/CustomizationParser.java | 20 ++++-----
46 files changed, 141 insertions(+), 124 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
b/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
index ca3d34ee32..f64fdc4a26 100644
--- a/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
+++ b/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
@@ -31,7 +31,7 @@ public final class NSDecl {
this.prefix = pfx.intern();
}
this.uri = ur.intern();
- this.hashCode = (toString()).hashCode();
+ this.hashCode = toString().hashCode();
}
public String getPrefix() {
diff --git
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
index 5f785b0400..c4d41b38e0 100644
---
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
+++
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
@@ -29,6 +29,8 @@ import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
import org.springframework.context.annotation.Configuration;
+//CHECKSTYLE:OFF
+
@Configuration
@ConditionalOnClass({ Resource.class, WebServiceContext.class })
public class CxfJaxwsAutoConfiguration {
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java
index 1d56299b86..9219d78cee 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java
@@ -60,7 +60,9 @@ public abstract class AbstractObservationClientProvider
extends AbstractTracingP
}
- protected void stopTraceSpan(final TraceScopeHolder<ObservationScope>
holder, @Nullable Exception ex, Consumer<Observation> addResponse) {
+ protected void stopTraceSpan(final TraceScopeHolder<ObservationScope>
holder,
+ @Nullable Exception ex,
+ Consumer<Observation> addResponse) {
if (holder == null) {
return;
}
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/CxfObservationConventionUtil.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/CxfObservationConventionUtil.java
index f7ee844c94..6eb16b837a 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/CxfObservationConventionUtil.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/CxfObservationConventionUtil.java
@@ -26,8 +26,8 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
-import
org.apache.cxf.tracing.micrometer.CxfObservationDocumentation.LowCardinalityKeys;
import org.apache.cxf.service.model.BindingOperationInfo;
+import
org.apache.cxf.tracing.micrometer.CxfObservationDocumentation.LowCardinalityKeys;
import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues;
@@ -45,11 +45,13 @@ final class CxfObservationConventionUtil {
static KeyValues getLowCardinalityKeyValues(Message msg) {
KeyValue rpcSystem = LowCardinalityKeys.RPC_SYSTEM.withValue("cxf");
- KeyValue rpcService =
LowCardinalityKeys.RPC_SERVICE.withValue(msg.getExchange().getService().getName().getLocalPart());
+ KeyValue rpcService = LowCardinalityKeys.RPC_SERVICE
+
.withValue(msg.getExchange().getService().getName().getLocalPart());
KeyValues keyValues = KeyValues.of(rpcSystem, rpcService);
BindingOperationInfo bindingOperationInfo =
msg.getExchange().getBindingOperationInfo();
if (bindingOperationInfo != null) {
- keyValues =
keyValues.and(LowCardinalityKeys.RPC_METHOD.withValue(bindingOperationInfo.getName().getLocalPart()));
+ keyValues = keyValues.and(LowCardinalityKeys.RPC_METHOD
+
.withValue(bindingOperationInfo.getName().getLocalPart()));
}
String endpointAdress = url(msg);
if (endpointAdress != null) {
@@ -59,7 +61,8 @@ final class CxfObservationConventionUtil {
KeyValue serverPort =
LowCardinalityKeys.SERVER_PORT.withValue(String.valueOf(uri.getPort()));
return keyValues.and(serverAddress, serverPort);
} catch (Exception ex) {
- LOG.log(Level.FINE, ex, () -> "Exception occurred while trying
to parse the URI from [" + endpointAdress + "] address");
+ LOG.log(Level.FINE, ex, ()
+ -> "Exception occurred while trying to parse the URI
from [" + endpointAdress + "] address");
return keyValues;
}
}
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientStartInterceptor.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientStartInterceptor.java
index 0c531f0ee2..f14d14a5a9 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientStartInterceptor.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientStartInterceptor.java
@@ -18,8 +18,6 @@
*/
package org.apache.cxf.tracing.micrometer;
-import static
org.apache.cxf.tracing.micrometer.CxfObservationDocumentation.OUT_OBSERVATION;
-import static
org.apache.cxf.tracing.micrometer.DefaultMessageOutObservationConvention.INSTANCE;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
@@ -29,6 +27,9 @@ import io.micrometer.common.lang.Nullable;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
+import static
org.apache.cxf.tracing.micrometer.CxfObservationDocumentation.OUT_OBSERVATION;
+import static
org.apache.cxf.tracing.micrometer.DefaultMessageOutObservationConvention.INSTANCE;
+
public class ObservationClientStartInterceptor extends
AbstractObservationClientInterceptor {
final MessageOutObservationConvention convention;
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationStartInterceptor.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationStartInterceptor.java
index d9ed5d260d..61a910caec 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationStartInterceptor.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationStartInterceptor.java
@@ -18,9 +18,6 @@
*/
package org.apache.cxf.tracing.micrometer;
-import static
org.apache.cxf.tracing.micrometer.CxfObservationDocumentation.IN_OBSERVATION;
-import static
org.apache.cxf.tracing.micrometer.DefaultMessageInObservationConvention.INSTANCE;
-
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxrs.ext.Nullable;
@@ -30,6 +27,10 @@ import org.apache.cxf.phase.Phase;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
+import static
org.apache.cxf.tracing.micrometer.CxfObservationDocumentation.IN_OBSERVATION;
+import static
org.apache.cxf.tracing.micrometer.DefaultMessageInObservationConvention.INSTANCE;
+
+
@NoJSR250Annotations
public class ObservationStartInterceptor extends
AbstractObservationInterceptor {
final MessageInObservationConvention convention;
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/AbstractJaxrsObservationConvention.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/AbstractJaxrsObservationConvention.java
index 58d18e6eea..2b7a7bdfd7 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/AbstractJaxrsObservationConvention.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/AbstractJaxrsObservationConvention.java
@@ -48,7 +48,9 @@ class AbstractJaxrsObservationConvention {
return keyValues;
}
- KeyValues highCardinalityKeyValues(int requestLength, @Nullable Integer
responseLength, @Nullable String userAgentHeader) {
+ KeyValues highCardinalityKeyValues(int requestLength,
+ @Nullable Integer responseLength,
+ @Nullable String userAgentHeader) {
KeyValues keyValues = KeyValues.empty();
KeyValue requestBody = requestLength != -1 ?
CommonHighCardinalityKeys.REQUEST_BODY_SIZE.withValue(
String.valueOf(requestLength)) : null;
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverContext.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverContext.java
index eda301562d..33a2d8cb61 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverContext.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverContext.java
@@ -19,10 +19,11 @@
package org.apache.cxf.tracing.micrometer.jaxrs;
-import io.micrometer.observation.transport.RequestReplyReceiverContext;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerResponseContext;
+import io.micrometer.observation.transport.RequestReplyReceiverContext;
+
/**
*
*/
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverObservationConvention.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverObservationConvention.java
index ea5516cd13..2ce4028bf6 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverObservationConvention.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestReceiverObservationConvention.java
@@ -25,7 +25,8 @@ import io.micrometer.observation.ObservationConvention;
/**
*
*/
-public interface ContainerRequestReceiverObservationConvention extends
ObservationConvention<ContainerRequestReceiverContext> {
+public interface ContainerRequestReceiverObservationConvention
+ extends ObservationConvention<ContainerRequestReceiverContext> {
@Override
default boolean supportsContext(Context context) {
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationContext.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationContext.java
index b9e058332b..041950de29 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationContext.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationContext.java
@@ -19,10 +19,11 @@
package org.apache.cxf.tracing.micrometer.jaxrs;
-import io.micrometer.observation.transport.RequestReplySenderContext;
import jakarta.ws.rs.client.ClientRequestContext;
import jakarta.ws.rs.client.ClientResponseContext;
+import io.micrometer.observation.transport.RequestReplySenderContext;
+
/**
*
*/
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationConvention.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationConvention.java
index 0ae10d2eb7..6424f344da 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationConvention.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ContainerRequestSenderObservationConvention.java
@@ -25,7 +25,8 @@ import io.micrometer.observation.ObservationConvention;
/**
*
*/
-public interface ContainerRequestSenderObservationConvention extends
ObservationConvention<ContainerRequestSenderObservationContext> {
+public interface ContainerRequestSenderObservationConvention
+ extends ObservationConvention<ContainerRequestSenderObservationContext> {
@Override
default boolean supportsContext(Context context) {
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestReceiverObservationConvention.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestReceiverObservationConvention.java
index 223ad19e5b..bceb1c4256 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestReceiverObservationConvention.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestReceiverObservationConvention.java
@@ -19,12 +19,12 @@
package org.apache.cxf.tracing.micrometer.jaxrs;
+import jakarta.ws.rs.container.ContainerRequestContext;
import org.apache.cxf.jaxrs.impl.ContainerRequestContextImpl;
import org.apache.cxf.jaxrs.model.URITemplate;
import
org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.ServerLowCardinalityKeys;
import io.micrometer.common.KeyValues;
-import jakarta.ws.rs.container.ContainerRequestContext;
/**
*
@@ -39,8 +39,8 @@ public class
DefaultContainerRequestReceiverObservationConvention extends Abstra
public KeyValues
getLowCardinalityKeyValues(ContainerRequestReceiverContext context) {
KeyValues keyValues =
lowCardinalityKeyValues(context.getRequestContext().getMethod(),
context.getRequestContext().getUriInfo().getBaseUri(),
- context.getResponse() !=
null ?
-
context.getResponse().getStatus() : null);
+ context.getResponse() !=
null
+ ?
context.getResponse().getStatus() : null);
String pathTemplate = pathTemplate(context.getRequestContext());
if (pathTemplate != null) {
keyValues =
keyValues.and(ServerLowCardinalityKeys.HTTP_ROUTE.withValue(pathTemplate));
@@ -51,8 +51,9 @@ public class
DefaultContainerRequestReceiverObservationConvention extends Abstra
@Override
public KeyValues
getHighCardinalityKeyValues(ContainerRequestReceiverContext context) {
return
highCardinalityKeyValues(context.getRequestContext().getLength(),
- context.getResponse() != null ?
context.getResponse().getLength() :
- null,
context.getRequestContext().getHeaderString("User-Agent"));
+ context.getResponse() != null
+ ?
context.getResponse().getLength() : null,
+
context.getRequestContext().getHeaderString("User-Agent"));
}
@Override
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestSenderObservationConvention.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestSenderObservationConvention.java
index 80b7a96a1a..853a3b6181 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestSenderObservationConvention.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/DefaultContainerRequestSenderObservationConvention.java
@@ -37,16 +37,16 @@ public class
DefaultContainerRequestSenderObservationConvention extends Abstract
public KeyValues
getLowCardinalityKeyValues(ContainerRequestSenderObservationContext context) {
return lowCardinalityKeyValues(context.getRequestContext().getMethod(),
context.getRequestContext().getUri(),
- context.getResponse() != null ?
context.getResponse().getStatus() :
- null);
+ context.getResponse() != null
+ ? context.getResponse().getStatus()
: null);
}
@Override
public KeyValues
getHighCardinalityKeyValues(ContainerRequestSenderObservationContext context) {
String contentLength =
context.getRequestContext().getHeaderString("Content-Length");
int requestLength = StringUtils.isEmpty(contentLength) ? -1 :
Integer.parseInt(contentLength);
- Integer responseLength = context.getResponse() != null ?
- context.getResponse().getLength() : null;
+ Integer responseLength = context.getResponse() != null
+ ? context.getResponse().getLength() : null;
KeyValues keyValues = highCardinalityKeyValues(requestLength,
responseLength,
context.getRequestContext()
.getHeaderString("User-Agent"));
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/JaxrsObservationDocumentation.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/JaxrsObservationDocumentation.java
index 6ab4f3773c..ecd5105a1a 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/JaxrsObservationDocumentation.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/JaxrsObservationDocumentation.java
@@ -159,7 +159,9 @@ enum JaxrsObservationDocumentation implements
ObservationDocumentation {
enum CommonHighCardinalityKeys implements KeyName {
/**
- * The size of the request payload body in bytes. This is the number
of bytes transferred excluding headers and is often, but not always, present as
the Content-Length header. For requests using transport encoding, this should
be the compressed size.
+ * The size of the request payload body in bytes. This is the number
of bytes transferred
+ * excluding headers and is often, but not always, present as the
Content-Length header.
+ * For requests using transport encoding, this should be the
compressed size.
*/
REQUEST_BODY_SIZE {
@Override
@@ -174,7 +176,10 @@ enum JaxrsObservationDocumentation implements
ObservationDocumentation {
},
/**
- * The size of the response payload body in bytes. This is the number
of bytes transferred excluding headers and is often, but not always, present as
the Content-Length header. For requests using transport encoding, this should
be the compressed size.
+ * The size of the response payload body in bytes. This is the number
of bytes
+ * transferred excluding headers and is often, but not always, present
as the
+ * Content-Length header. For requests using transport encoding, this
should be
+ * the compressed size.
*/
RESPONSE_BODY_SIZE {
@Override
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationClientProvider.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationClientProvider.java
index dee094428e..6fc8d80c8b 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationClientProvider.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationClientProvider.java
@@ -18,22 +18,22 @@
*/
package org.apache.cxf.tracing.micrometer.jaxrs;
-import static
org.apache.cxf.tracing.micrometer.jaxrs.DefaultContainerRequestSenderObservationConvention.INSTANCE;
-import static
org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.OUT_OBSERVATION;
-
import java.io.IOException;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.ClientResponseContext;
+import jakarta.ws.rs.client.ClientResponseFilter;
+import jakarta.ws.rs.ext.Provider;
import org.apache.cxf.jaxrs.ext.Nullable;
import org.apache.cxf.tracing.micrometer.AbstractObservationClientProvider;
import org.apache.cxf.tracing.micrometer.ObservationScope;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
-import jakarta.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.client.ClientRequestFilter;
-import jakarta.ws.rs.client.ClientResponseContext;
-import jakarta.ws.rs.client.ClientResponseFilter;
-import jakarta.ws.rs.ext.Provider;
+
+import static
org.apache.cxf.tracing.micrometer.jaxrs.DefaultContainerRequestSenderObservationConvention.INSTANCE;
+import static
org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.OUT_OBSERVATION;
@Provider
public class ObservationClientProvider extends
AbstractObservationClientProvider
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationContextProvider.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationContextProvider.java
index 350004a01c..cbf1f7bd22 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationContextProvider.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationContextProvider.java
@@ -20,8 +20,8 @@ package org.apache.cxf.tracing.micrometer.jaxrs;
import org.apache.cxf.jaxrs.ext.ContextProvider;
import org.apache.cxf.message.Message;
-import org.apache.cxf.tracing.micrometer.ObservationTracerContext;
import org.apache.cxf.tracing.TracerContext;
+import org.apache.cxf.tracing.micrometer.ObservationTracerContext;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationFeature.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationFeature.java
index 17d7a86e5a..a5c02f92cd 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationFeature.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationFeature.java
@@ -18,12 +18,12 @@
*/
package org.apache.cxf.tracing.micrometer.jaxrs;
-import org.apache.cxf.jaxrs.ext.Nullable;
-
-import io.micrometer.observation.ObservationRegistry;
import jakarta.ws.rs.core.Feature;
import jakarta.ws.rs.core.FeatureContext;
import jakarta.ws.rs.ext.Provider;
+import org.apache.cxf.jaxrs.ext.Nullable;
+
+import io.micrometer.observation.ObservationRegistry;
@Provider
public class ObservationFeature implements Feature {
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationProvider.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationProvider.java
index 52818d630f..b513526854 100644
---
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationProvider.java
+++
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationProvider.java
@@ -18,17 +18,9 @@
*/
package org.apache.cxf.tracing.micrometer.jaxrs;
-import static
org.apache.cxf.tracing.micrometer.jaxrs.DefaultContainerRequestReceiverObservationConvention.INSTANCE;
-import static
org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.IN_OBSERVATION;
-
import java.io.IOException;
import java.lang.annotation.Annotation;
-import org.apache.cxf.tracing.micrometer.AbstractObservationProvider;
-import org.apache.cxf.tracing.micrometer.ObservationScope;
-
-import io.micrometer.observation.Observation;
-import io.micrometer.observation.ObservationRegistry;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.ContainerResponseContext;
@@ -37,6 +29,15 @@ import jakarta.ws.rs.container.ResourceInfo;
import jakarta.ws.rs.container.Suspended;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.ext.Provider;
+import org.apache.cxf.tracing.micrometer.AbstractObservationProvider;
+import org.apache.cxf.tracing.micrometer.ObservationScope;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+
+import static
org.apache.cxf.tracing.micrometer.jaxrs.DefaultContainerRequestReceiverObservationConvention.INSTANCE;
+import static
org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.IN_OBSERVATION;
+
@Provider
public class ObservationProvider extends AbstractObservationProvider
diff --git
a/integration/tracing/tracing-micrometer/src/test/java/org/apache/cxf/tracing/micrometer/ObservationIntegrationTest.java
b/integration/tracing/tracing-micrometer/src/test/java/org/apache/cxf/tracing/micrometer/ObservationIntegrationTest.java
index d361d131db..8551dfffd9 100644
---
a/integration/tracing/tracing-micrometer/src/test/java/org/apache/cxf/tracing/micrometer/ObservationIntegrationTest.java
+++
b/integration/tracing/tracing-micrometer/src/test/java/org/apache/cxf/tracing/micrometer/ObservationIntegrationTest.java
@@ -24,7 +24,6 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.junit.jupiter.api.AfterEach;
import io.micrometer.core.tck.MeterRegistryAssert;
import io.micrometer.observation.ObservationRegistry;
@@ -32,6 +31,9 @@ import io.micrometer.tracing.exporter.FinishedSpan;
import io.micrometer.tracing.test.SampleTestRunner;
import io.micrometer.tracing.test.simple.SpansAssert;
+import org.junit.jupiter.api.AfterEach;
+
+
public class ObservationIntegrationTest extends SampleTestRunner {
private static final String ADDRESS = "http://localhost:9282";;
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
index fc4bb2ff5b..c1f9a4c76a 100644
---
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
+++
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
@@ -51,7 +51,7 @@ public abstract class AbstractOpenTelemetryProvider extends
AbstractTracingProvi
protected AbstractOpenTelemetryProvider(final OpenTelemetry openTelemetry,
final Tracer tracer) {
this.openTelemetry = openTelemetry;
- this.tracer =tracer;
+ this.tracer = tracer;
}
protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String,
List<String>> requestHeaders,
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
index 2d55874e70..e95ed623b8 100644
---
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
+++
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryFeature.java
@@ -40,7 +40,9 @@ public class OpenTelemetryFeature extends
DelegatingFeature<OpenTelemetryFeature
super(new Portable());
}
- public OpenTelemetryFeature(final String instrumentationName) { super(new
Portable(instrumentationName)); }
+ public OpenTelemetryFeature(final String instrumentationName) {
+ super(new Portable(instrumentationName));
+ }
public OpenTelemetryFeature(final OpenTelemetry openTelemetry) {
super(new Portable(openTelemetry));
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
index 83f74847d9..b02efaa714 100644
---
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
+++
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
@@ -18,13 +18,14 @@
*/
package org.apache.cxf.tracing.opentelemetry.jaxrs;
-import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.trace.Tracer;
import jakarta.ws.rs.core.Feature;
import jakarta.ws.rs.core.FeatureContext;
import jakarta.ws.rs.ext.Provider;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Tracer;
+
@Provider
public class OpenTelemetryFeature implements Feature {
public static final String DEFAULT_INSTRUMENTATION_NAME = "org.apache.cxf";
diff --git a/parent/pom.xml b/parent/pom.xml
index bf2853df61..23f2368bf5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -398,7 +398,6 @@
</dependency>
</dependencies>
<configuration>
- <encoding>UTF-8</encoding>
<includeResources>false</includeResources>
</configuration>
<executions>
@@ -445,7 +444,6 @@
<rulesets>
<ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
</rulesets>
- <sourceEncoding>UTF-8</sourceEncoding>
<targetJdk>11</targetJdk>
<linkXRef>false</linkXRef>
<includeTests>true</includeTests>
@@ -596,6 +594,23 @@
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+
<showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <compilerArgument>${cxf.compile.flags}</compilerArgument>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-xml2fastinfoset-plugin</artifactId>
@@ -2038,34 +2053,6 @@
<checkstyle.skip>true</checkstyle.skip>
</properties>
</profile>
- <profile>
- <!-- default profile enables checkstyle and Xlint stuff -->
- <id>sourcecheck</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
-
<showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
- <showWarnings>true</showWarnings>
-
<compilerArgument>${cxf.compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>set.eclipse.output</id>
<properties>
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java
index af44b91d92..a4e1e4fe96 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java
@@ -44,7 +44,7 @@ public class CustomJaxbProvider implements
MessageBodyReader<JAXBElement<String>
@Override
public long getSize(JAXBElement<String> t, Class<?> type, Type
genericType, Annotation[] annotations,
MediaType mediaType) {
- return t.getValue().toString().length() + 2;
+ return t.getValue().length() + 2;
}
@Override
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientRequest.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientRequest.java
index 5e935623c9..789c293954 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientRequest.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientRequest.java
@@ -55,7 +55,7 @@ public class NettyHttpClientRequest {
this.request =
new DefaultFullHttpRequest(HttpVersion.HTTP_1_1,
HttpMethod.valueOf(method),
- uri.getPath().toString(), content);
+ uri.getPath(), content);
// setup the default headers
request.headers().set("Connection", "keep-alive");
request.headers().set("Host", uri.getHost() + ":"
diff --git
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index db97925ea8..92e9f7d9c7 100644
---
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -668,7 +668,8 @@ public class NettyHttpDestinationTest {
when(request.getHeaderNames()).thenReturn(Utils.enumeration(headerNames));
when(request.getHeaders("content-type")).thenReturn(Utils.enumeration(contentType));
-
when(request.getHeaders(NettyHttpDestinationTest.AUTH_HEADER)).thenReturn(Utils.enumeration(authHeader));
+ when(request.getHeaders(NettyHttpDestinationTest.AUTH_HEADER))
+ .thenReturn(Utils.enumeration(authHeader));
when(request.getInputStream()).thenReturn(is);
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index 52f7c3ecb9..b0a57cd1ea 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.TimerTask;
import javax.xml.namespace.QName;
@@ -384,7 +385,7 @@ public class RMManagerTest {
eq(false),
isA(ProtocolVariation.class),
isA(Exchange.class),
- CastUtils.cast(isA(HashMap.class), String.class,
Object.class)))
+ CastUtils.cast(isA(Map.class), String.class,
Object.class)))
.thenReturn(createResponse);
Servant servant = mock(Servant.class);
when(rme.getServant()).thenReturn(servant);
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
index 48a4cef07a..07f8d9c40d 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
@@ -176,7 +176,7 @@ public class LdapClaimsHandler implements ClaimsHandler,
RealmSupport {
} else {
List<String> searchAttributeList = new ArrayList<>();
for (Claim claim : claims) {
- String claimType = claim.getClaimType().toString();
+ String claimType = claim.getClaimType();
if
(getClaimsLdapAttributeMapping().keySet().contains(claimType)) {
searchAttributeList.add(
getClaimsLdapAttributeMapping().get(claimType)
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java
index fef69e84ea..dd86c06c1b 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapGroupClaimsHandler.java
@@ -178,7 +178,7 @@ public class LdapGroupClaimsHandler implements
ClaimsHandler, RealmSupport {
boolean found = false;
for (Claim claim: claims) {
- if (claim.getClaimType().toString().equals(this.groupURI)) {
+ if (claim.getClaimType().equals(this.groupURI)) {
found = true;
break;
}
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticClaimsHandler.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticClaimsHandler.java
index 9fabba6c71..9294ffbad8 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticClaimsHandler.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticClaimsHandler.java
@@ -53,11 +53,11 @@ public class StaticClaimsHandler implements ClaimsHandler {
ProcessedClaimCollection claimsColl = new ProcessedClaimCollection();
for (Claim claim : claims) {
- if
(getGlobalClaims().keySet().contains(claim.getClaimType().toString())) {
+ if (getGlobalClaims().keySet().contains(claim.getClaimType())) {
ProcessedClaim c = new ProcessedClaim();
c.setClaimType(claim.getClaimType());
c.setPrincipal(parameters.getPrincipal());
-
c.addValue(getGlobalClaims().get(claim.getClaimType().toString()));
+ c.addValue(getGlobalClaims().get(claim.getClaimType()));
claimsColl.add(c);
} else {
if (LOG.isLoggable(Level.FINER)) {
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticEndpointClaimsHandler.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticEndpointClaimsHandler.java
index 93e27f4a01..af4f39e4bc 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticEndpointClaimsHandler.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/StaticEndpointClaimsHandler.java
@@ -72,11 +72,11 @@ public class StaticEndpointClaimsHandler implements
ClaimsHandler {
return claimsColl;
}
for (Claim claim : claims) {
- if
(endpointClaims.keySet().contains(claim.getClaimType().toString())) {
+ if (endpointClaims.keySet().contains(claim.getClaimType())) {
ProcessedClaim c = new ProcessedClaim();
c.setClaimType(claim.getClaimType());
c.setPrincipal(parameters.getPrincipal());
-
c.addValue(endpointClaims.get(claim.getClaimType().toString()));
+ c.addValue(endpointClaims.get(claim.getClaimType()));
claimsColl.add(c);
} else {
if (LOG.isLoggable(Level.FINER)) {
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
index 9d7e8cfa91..2d5feb8f34 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
@@ -101,7 +101,7 @@ public class ClaimUtils {
return null;
}
for (ProcessedClaim c : processedClaims) {
- if (c.getClaimType() != null &&
processedClaimType.equals(c.getClaimType().toString())) {
+ if (c.getClaimType() != null &&
processedClaimType.equals(c.getClaimType())) {
return c;
}
}
@@ -121,7 +121,7 @@ public class ClaimUtils {
if (processedClaims != null && map != null) {
for (ProcessedClaim c : processedClaims) {
String processedClaimType = (c.getClaimType() != null)
- ? c.getClaimType().toString()
+ ? c.getClaimType()
: "";
String mappedProcessedClaimType = map.get(processedClaimType);
if (mappedProcessedClaimType != null) {
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
index 5f3c3b3c59..53cfeef605 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/EventMapper.java
@@ -116,14 +116,14 @@ public class EventMapper implements STSEventListener {
if (params.getRequestedPrimaryClaims() != null) {
List<String> claims = new ArrayList<>();
for (Claim claim : params.getRequestedPrimaryClaims()) {
- claims.add(claim.getClaimType().toString());
+ claims.add(claim.getClaimType());
}
map.put(KEYS.CLAIMS_PRIMARY.name(), claims.toString());
}
if (params.getRequestedSecondaryClaims() != null) {
List<String> claims = new ArrayList<>();
for (Claim claim : params.getRequestedSecondaryClaims()) {
- claims.add(claim.getClaimType().toString());
+ claims.add(claim.getClaimType());
}
map.put(KEYS.CLAIMS_SECONDARY.name(), claims.toString());
}
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 708f2592c7..9f02af9332 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
@@ -161,7 +161,7 @@ public class DefaultJWTClaimsProvider implements
JWTClaimsProvider {
if (claim.getValues().size() == 1) {
claimValues = claim.getValues().get(0);
}
-
claims.setProperty(translateClaim(claim.getClaimType().toString()),
claimValues);
+ claims.setProperty(translateClaim(claim.getClaimType()),
claimValues);
}
}
}
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
index 4f6ffa3b0f..0edec9b372 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
@@ -68,13 +68,12 @@ public class JexlClaimsMapperTest {
assertNotNull(result);
assertTrue(result.size() >= 2);
-
assertEquals("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name";,
result.get(1).getClaimType()
- .toString());
+
assertEquals("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name";,
result.get(1).getClaimType());
assertEquals(1, result.get(1).getValues().size());
assertEquals("Jan Bernhardt", result.get(1).getValues().get(0));
for (ProcessedClaim c : result) {
- if
("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname".equals(c.getClaimType().toString()))
{
+ if
("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname".equals(c.getClaimType()))
{
fail("Only merged claim should be in result set, but not the
individual claims");
}
}
@@ -254,7 +253,7 @@ public class JexlClaimsMapperTest {
return null;
}
for (ProcessedClaim c : claims) {
- if (c.getClaimType() != null &&
claimType.equals(c.getClaimType().toString())) {
+ if (c.getClaimType() != null &&
claimType.equals(c.getClaimType())) {
return c;
}
}
diff --git
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java
index 9c5904a126..8a1eb18ff7 100644
---
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java
+++
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java
@@ -156,9 +156,9 @@ public class CustomAttributeProvider implements
AttributeStatementProvider {
AttributeBean attributeBean = new AttributeBean();
if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType)
|| WSS4JConstants.SAML2_NS.equals(tokenType)) {
- attributeBean.setQualifiedName(claim.getClaimType().toString());
+ attributeBean.setQualifiedName(claim.getClaimType());
} else {
- attributeBean.setSimpleName(claim.getClaimType().toString());
+ attributeBean.setSimpleName(claim.getClaimType());
}
attributeBean.setAttributeValues(claim.getValues());
diff --git
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index 63a5a3552b..0f19784f64 100644
---
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -313,7 +313,7 @@ public class STSRESTTest extends
AbstractBusClientServerTestBase {
assertEquals(1, claims.size());
Claim claim = claims.get(0);
String role =
"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role";;
- assertNotEquals(role, claim.getClaimType().toString());
+ assertNotEquals(role, claim.getClaimType());
// Now get another token specifying the role
client.query("claim", role);
@@ -325,7 +325,7 @@ public class STSRESTTest extends
AbstractBusClientServerTestBase {
claims = SAMLUtils.getClaims(assertion);
assertEquals(1, claims.size());
claim = claims.get(0);
- assertEquals(role, claim.getClaimType().toString());
+ assertEquals(role, claim.getClaimType());
assertEquals("ordinary-user", claim.getValues().get(0));
}
diff --git
a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
index e9926398ee..62c0052efb 100644
---
a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
+++
b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
@@ -58,7 +58,7 @@ public abstract class AbstractTomcatServer extends
AbstractBusTestServerBase {
server.getHost().setAutoDeploy(true);
server.getHost().setDeployOnStartup(true);
- server.addWebapp(contextPath,
getClass().getResource(resourcePath).toURI().getPath().toString());
+ server.addWebapp(contextPath,
getClass().getResource(resourcePath).toURI().getPath());
server.start();
} catch (final Exception ex) {
ex.printStackTrace();
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 5480b6383c..52afdd0dab 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -858,8 +858,8 @@ public class BookStore {
throw new RuntimeException();
}
MultivaluedMap<String, String> map = segment.getMatrixParameters();
- String s1 = map.getFirst("first").toString();
- String s2 = map.getFirst("second").toString();
+ String s1 = map.getFirst("first");
+ String s2 = map.getFirst("second");
return doGetBook(s1 + s2);
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java
index 4d51db80b7..f2c02cbf13 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java
@@ -44,7 +44,7 @@ public class CXFJaxbElementProvider implements
MessageBodyReader<JAXBElement<Str
@Override
public long getSize(JAXBElement<String> t, Class<?> type, Type
genericType, Annotation[] annotations,
MediaType mediaType) {
- return t.getValue().toString().length() + 2;
+ return t.getValue().length() + 2;
}
@Override
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
index e682b6525e..1cb5bb01e8 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
@@ -214,7 +214,7 @@ public class DispatchClientServerTest extends
AbstractBusClientServerTestBase {
while (nodes.hasNext()) {
jakarta.xml.soap.Node nd = nodes.next();
if (nd instanceof SOAPElement) {
- SOAPElement se = ((SOAPElement)nd);
+ SOAPElement se = (SOAPElement)nd;
for (int x = 0; x < 100; x++) {
se.addTextNode("TestSoapMessageTestSoapMessageTestSoapMessageTestSoapMessage");
}
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
index 10bfeb22d3..834ff047a2 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
@@ -32,8 +32,8 @@ import
org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class CXF7990Test extends AbstractClientServerTestBase {
diff --git
a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
index d3ee393beb..bc5cdb6be2 100644
---
a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
+++
b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
@@ -76,7 +76,7 @@ public abstract class AbstractTomcatServer extends
AbstractBusTestServerBase {
server.getHost().setAppBase(base.toString());
server.getHost().setAutoDeploy(true);
server.getHost().setDeployOnStartup(true);
- server.addWebapp(contextPath,
getClass().getResource(resourcePath).toURI().getPath().toString());
+ server.addWebapp(contextPath,
getClass().getResource(resourcePath).toURI().getPath());
}
server.start();
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 5415aab43e..13a6b5919e 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
@@ -162,7 +162,7 @@ public abstract class AbstractTypeTestClient2 extends
AbstractTypeTestClient {
return (Double.compare(x.getVarFloat(), y.getVarFloat()) == 0)
&& (x.getVarInt().compareTo(y.getVarInt()) == 0)
&& (x.getVarString().equals(y.getVarString()))
- && (equalsNilable(x.getVarAttrString(), y.getVarAttrString()));
+ && equalsNilable(x.getVarAttrString(), y.getVarAttrString());
}
@Test
public void testSimpleStruct() throws Exception {
diff --git
a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 54b419fd9c..46a7e5f507 100644
---
a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++
b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -296,7 +296,7 @@ public class CommandLineParserTest {
String lineSeparator = System.getProperty("line.separator");
StringTokenizer st1 = new StringTokenizer(parser.getDetailedUsage(),
lineSeparator);
while (st1.hasMoreTokens()) {
- assertEquals("Failed at line " + index, expected[index++],
st1.nextToken().toString().trim());
+ assertEquals("Failed at line " + index, expected[index++],
st1.nextToken().trim());
}
}
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
index 173dd10926..940085d888 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
@@ -30,6 +30,17 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import javax.xml.XMLConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
@@ -48,16 +59,7 @@ import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
import
org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import javax.xml.XMLConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
public final class CustomizationParser {
// For WSDL1.1
