You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/20 11:43:32 UTC
[tomee] branch master updated: Support for Johnzon 1.2.9
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 63fd587 Support for Johnzon 1.2.9
63fd587 is described below
commit 63fd587f6682b9a16ac7717a5b9926111c817186
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Fri Nov 20 12:43:01 2020 +0100
Support for Johnzon 1.2.9
---
pom.xml | 2 +-
.../openejb/server/cxf/rs/johnzon/TomEEConfigurableJohnzon.java | 4 ++--
.../org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c8add2..416dd8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<openjpa.version>3.1.2</openjpa.version>
<openwebbeans.version>2.0.12</openwebbeans.version>
<jcs.version>2.1</jcs.version>
- <johnzon.version>1.2.5</johnzon.version>
+ <johnzon.version>1.2.9-SNAPSHOT</johnzon.version>
<!-- Maven module versions -->
<maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEConfigurableJohnzon.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEConfigurableJohnzon.java
index 57bb29f..3462961 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEConfigurableJohnzon.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEConfigurableJohnzon.java
@@ -44,7 +44,7 @@ public class TomEEConfigurableJohnzon<T> extends ConfigurableJohnzonProvider<T>
public void setConverters(final Collection<Converter<?>> converters) {
for (final Converter<?> converter : converters) {
final Type type = findType(converter, Converter.class);
- builder().addAdapter(ParameterizedType.class.cast(type).getActualTypeArguments()[0], String.class, new ConverterAdapter(converter));
+ builder().addAdapter(ParameterizedType.class.cast(type).getActualTypeArguments()[0], String.class, new ConverterAdapter(converter, type));
}
}
@@ -67,7 +67,7 @@ public class TomEEConfigurableJohnzon<T> extends ConfigurableJohnzonProvider<T>
}
public void setDatePattern(final String datePattern) {
- builder().addAdapter(Date.class, String.class, new ConverterAdapter<>(new DateConverter(datePattern)));
+ builder().addAdapter(Date.class, String.class, new ConverterAdapter<>(new DateConverter(datePattern), Date.class));
}
private Type findType(final Object ref, final Class<?> api) { // need to impl adapters directly
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
index 4211b6e..f7d37c9 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbProvider.java
@@ -32,6 +32,7 @@ import java.util.Locale;
public class TomEEJsonbProvider<T> extends JsonbJaxrsProvider<T> {
public TomEEJsonbProvider() {
config.withPropertyVisibilityStrategy(new TomEEJsonbPropertyVisibilityStrategy());
+ setThrowNoContentExceptionOnEmptyStreams(true); // this is to make TCK tests happy
}
public void setDateFormat(String dateFormat) {