This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push: new 121456a JOHNZON-283 remove @Provider from redundant impls in jaxrs module 121456a is described below commit 121456ab3d477f4f5967ed0ec67dde90d62e586d Author: Romain Manni-Bucau <rmannibu...@apache.org> AuthorDate: Sat Sep 28 17:30:47 2019 +0200 JOHNZON-283 remove @Provider from redundant impls in jaxrs module --- .../java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java | 3 +-- .../main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java | 3 +-- .../main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java | 3 +-- .../src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java | 2 +- .../src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java | 3 +-- .../src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java | 3 +-- johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java | 3 +-- .../org/apache/johnzon/jaxrs/WildcardConfigurableJohnzonProvider.java | 3 +-- .../main/java/org/apache/johnzon/jaxrs/WildcardJohnzonProvider.java | 2 +- .../src/main/java/org/apache/johnzon/jaxrs/WildcardJsrProvider.java | 3 +-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java index 3ab6682..9b853db 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/ConfigurableJohnzonProvider.java @@ -41,14 +41,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; import org.apache.johnzon.mapper.MapperBuilder; import org.apache.johnzon.mapper.SerializeValueFilter; import org.apache.johnzon.mapper.access.AccessMode; import org.apache.johnzon.mapper.access.BaseAccessMode; -@Provider +// @Provider // don't let it be scanned, it would conflict with JohnzonProvider @Produces("application/json") @Consumes("application/json") public class ConfigurableJohnzonProvider<T> implements MessageBodyWriter<T>, MessageBodyReader<T> { diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java index 42fcbf0..b65349d 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyReader.java @@ -27,7 +27,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -36,7 +35,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; -@Provider +// @Provider // don't let it be scanned, it would conflict with JohnzonProvider @Consumes({ "application/json", "*/json", "*/*+json", "*/x-json", diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java index 6a3e163..9c7b1ac 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonMessageBodyWriter.java @@ -28,7 +28,6 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -37,7 +36,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collection; -@Provider +// @Provider // don't let it be scanned, it would conflict with JohnzonProvider @Produces({ "application/json", "*/json", "*/*+json", "*/x-json", diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java index b1e137f..9847c4d 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JohnzonProvider.java @@ -31,7 +31,7 @@ import java.util.Collection; @Consumes("application/json") public class JohnzonProvider<T> extends DelegateProvider<T> { public JohnzonProvider(final Mapper mapper, final Collection<String> ignores) { - super(new JohnzonMessageBodyReader<T>(mapper, ignores), new JohnzonMessageBodyWriter<T>(mapper, ignores)); + super(new JohnzonMessageBodyReader<>(mapper, ignores), new JohnzonMessageBodyWriter<>(mapper, ignores)); } public JohnzonProvider() { diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java index 7a48bd4..69b0825 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyReader.java @@ -27,7 +27,6 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; @@ -36,7 +35,7 @@ import java.util.Collections; import static org.apache.johnzon.mapper.internal.Streams.noClose; -@Provider +// @Provider // don't let it be scanned, it would conflict with JsrProvider @Consumes({ "application/json", "*/json", "*/*+json", "*/x-json", diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java index 6d23c3b..b6163c2 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrMessageBodyWriter.java @@ -27,7 +27,6 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation; @@ -36,7 +35,7 @@ import java.util.Collections; import static org.apache.johnzon.mapper.internal.Streams.noClose; -@Provider +// @Provider // don't let it be scanned, it would conflict with JsrProvider @Produces({ "application/json", "*/json", "*/*+json", "*/x-json", diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java index 06ec86d..c6105bc 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/JsrProvider.java @@ -21,9 +21,8 @@ package org.apache.johnzon.jaxrs; import javax.json.JsonStructure; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; -@Provider +// @Provider // don't let it be scanned, it would conflict with JohnzonProvider @Produces("application/json") @Consumes("application/json") public class JsrProvider extends DelegateProvider<JsonStructure> { diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardConfigurableJohnzonProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardConfigurableJohnzonProvider.java index aa71150..5fc52fa 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardConfigurableJohnzonProvider.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardConfigurableJohnzonProvider.java @@ -31,7 +31,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -44,7 +43,7 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Arrays.asList; -@Provider +// @Provider // don't let it be scanned, it would conflict with WildcardJohnzonProvider @Produces({ "*/json", "*/*+json", "*/x-json", diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJohnzonProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJohnzonProvider.java index c573fff..275c0f1 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJohnzonProvider.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJohnzonProvider.java @@ -26,7 +26,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.ext.Provider; import java.util.Collection; -@Provider +@Provider // this is scanned cause does not overlap with JohnzonProvider in terms of mime types @Produces({ "*/json", "*/*+json", "*/x-json", diff --git a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJsrProvider.java b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJsrProvider.java index 66d3791..e424207 100644 --- a/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJsrProvider.java +++ b/johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/WildcardJsrProvider.java @@ -21,9 +21,8 @@ package org.apache.johnzon.jaxrs; import javax.json.JsonStructure; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; -import javax.ws.rs.ext.Provider; -@Provider +// @Provider // don't let it be scanned, it would conflict with JsrProvider @Produces({ "*/json", "*/*+json", "*/x-json",