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 2019/11/10 01:55:12 UTC
[cxf] branch 3.3.x-fixes updated: CXF-8144: OpenAPI v3 Feature:
duplicated methods. The issue is caused by the Portable feature
refactorings,
basically half of the Portable*s are annotated with CXF's @Provider
annotation, which in case of Spring-based scanning,
leads to discovery and registration of both features
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 4e027fc CXF-8144: OpenAPI v3 Feature: duplicated methods. The issue is caused by the Portable feature refactorings, basically half of the Portable*s are annotated with CXF's @Provider annotation, which in case of Spring-based scanning, leads to discovery and registration of both features
4e027fc is described below
commit 4e027fc06ad325787c59dae7330afb01e1199686
Author: reta <dr...@gmail.com>
AuthorDate: Sat Nov 9 17:12:09 2019 -0500
CXF-8144: OpenAPI v3 Feature: duplicated methods. The issue is caused by the Portable feature refactorings, basically half of the Portable*s are annotated with CXF's @Provider annotation, which in case of Spring-based scanning, leads to discovery and registration of both features
(cherry picked from commit d84e9a16307ac868709c15fc778942bb01aa68de)
---
core/src/main/java/org/apache/cxf/feature/LoggingFeature.java | 1 -
core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java | 1 -
core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java | 1 -
.../main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java | 1 -
.../src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java | 1 -
.../src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java | 1 -
.../org/apache/cxf/tracing/opentracing/OpenTracingClientFeature.java | 1 -
.../main/java/org/apache/cxf/tracing/opentracing/OpenTracingFeature.java | 1 -
.../logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java | 1 -
.../metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java | 1 -
.../java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationFeature.java | 1 -
.../src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java | 1 -
rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseFeature.java | 1 -
13 files changed, 13 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
index 738ab88..6d06623 100644
--- a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
@@ -91,7 +91,6 @@ public class LoggingFeature extends DelegatingFeature<LoggingFeature.Portable> {
delegate.setPrettyLogging(prettyLogging);
}
- @Provider(Type.Feature)
public static class Portable implements AbstractPortableFeature {
private static final int DEFAULT_LIMIT = AbstractLoggingInterceptor.DEFAULT_LIMIT;
private static final LoggingInInterceptor IN = new LoggingInInterceptor(DEFAULT_LIMIT);
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
index 9b7d53c..284fdc0 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
@@ -77,7 +77,6 @@ public class GZIPFeature extends DelegatingFeature<GZIPFeature.Portable> {
return delegate.getForce();
}
- @Provider(value = Provider.Type.Feature)
public static class Portable implements AbstractPortableFeature {
private static final GZIPInInterceptor IN = new GZIPInInterceptor();
private static final GZIPOutInterceptor OUT = new GZIPOutInterceptor();
diff --git a/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java b/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
index d5da2a3..e8b4fbd 100644
--- a/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
+++ b/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
@@ -37,7 +37,6 @@ public class BeanValidationFeature extends DelegatingFeature<BeanValidationFeatu
delegate.setProvider(provider);
}
- @Provider(value = Type.Feature, scope = Scope.Server)
public static class Portable implements AbstractPortableFeature {
private BeanValidationProvider validationProvider;
diff --git a/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java b/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
index 31b01b5..7aa802d 100644
--- a/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
+++ b/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
@@ -44,7 +44,6 @@ public class ClientBeanValidationFeature extends DelegatingFeature<ClientBeanVal
delegate.setProvider(provider);
}
- @Provider(value = Type.Feature, scope = Scope.Client)
public static class Portable implements AbstractPortableFeature {
private BeanValidationProvider validationProvider;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
index 17d8390..8d0fd6e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
@@ -40,7 +40,6 @@ public class BraveClientFeature extends DelegatingFeature<BraveClientFeature.Por
super(new Portable(brave));
}
- @Provider(value = Type.Feature, scope = Scope.Client)
public static class Portable implements AbstractPortableFeature {
private BraveClientStartInterceptor out;
private BraveClientStopInterceptor in;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
index 7414739..90d69e7 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -50,7 +50,6 @@ public class BraveFeature extends DelegatingFeature<BraveFeature.Portable> {
super(new Portable(brave));
}
- @Provider(value = Type.Feature, scope = Scope.Server)
public static class Portable implements AbstractPortableFeature {
private BraveStartInterceptor in;
private BraveStopInterceptor out;
diff --git a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingClientFeature.java b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingClientFeature.java
index e2b010e..f21da8c 100644
--- a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingClientFeature.java
+++ b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingClientFeature.java
@@ -36,7 +36,6 @@ public class OpenTracingClientFeature extends DelegatingFeature<OpenTracingClien
super(new Portable(tracer));
}
- @Provider(value = Type.Feature, scope = Scope.Client)
public static class Portable implements AbstractPortableFeature {
private OpenTracingClientStartInterceptor out;
private OpenTracingClientStopInterceptor in;
diff --git a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingFeature.java b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingFeature.java
index 9b91918..9c6fd5a 100644
--- a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingFeature.java
+++ b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingFeature.java
@@ -41,7 +41,6 @@ public class OpenTracingFeature extends DelegatingFeature<OpenTracingFeature.Por
super(new Portable(tracer));
}
- @Provider(value = Type.Feature, scope = Scope.Server)
public static class Portable implements AbstractPortableFeature {
private OpenTracingStartInterceptor in;
private OpenTracingStopInterceptor out;
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
index 25851cc..0646ff6 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
@@ -100,7 +100,6 @@ public class LoggingFeature extends DelegatingFeature<LoggingFeature.Portable> {
delegate.addBinaryContentMediaTypes(mediaTypes);
}
- @Provider(value = Type.Feature)
public static class Portable implements AbstractPortableFeature {
private LoggingInInterceptor in;
private LoggingOutInterceptor out;
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
index 15ab372..b3ab9e3 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
@@ -58,7 +58,6 @@ public class MetricsFeature extends DelegatingFeature<MetricsFeature.Portable> {
super(new Portable(providers));
}
- @Provider(Type.Feature)
public static class Portable implements AbstractPortableFeature {
MetricsProvider[] providers;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationFeature.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationFeature.java
index 49ef1a8..a4e0174 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationFeature.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationFeature.java
@@ -43,7 +43,6 @@ public class JAXRSBeanValidationFeature extends DelegatingFeature<JAXRSBeanValid
delegate.setSupportMultipleValidations(supportMultipleValidations);
}
- @Provider(value = Type.Feature, scope = Scope.Server)
public static class Portable implements AbstractPortableFeature {
private BeanValidationProvider validationProvider;
diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
index c35fffa..6287345 100644
--- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
+++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
@@ -377,7 +377,6 @@ public class OpenApiFeature extends DelegatingFeature<OpenApiFeature.Portable>
return delegate.createOpenApiResource();
}
- @Provider(value = Type.Feature, scope = Scope.Server)
public static class Portable implements AbstractPortableFeature, SwaggerUiSupport, SwaggerProperties {
private String version;
private String title;
diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseFeature.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseFeature.java
index 92c85fe..7678162 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseFeature.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseFeature.java
@@ -37,7 +37,6 @@ public class SseFeature extends DelegatingFeature<SseFeature.Portable> {
super(new Portable());
}
- @Provider(value = Type.Feature, scope = Scope.Server)
public static class Portable implements AbstractPortableFeature {
@Override