This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 38c8f53 TAP5-2696: fixing JacksonHttpRequestBodyConverter contribution
38c8f53 is described below
commit 38c8f53fa8f145ae67b248454dbb6f553a84fe54
Author: Thiago H. de Paula Figueiredo <[email protected]>
AuthorDate: Mon Jan 17 18:35:12 2022 -0300
TAP5-2696: fixing JacksonHttpRequestBodyConverter contribution
plus some smaller fixes and adjustments
---
build.gradle | 2 +-
.../src/main/java/org/apache/tapestry5/SymbolConstants.java | 3 +--
.../main/java/org/apache/tapestry5/modules/TapestryModule.java | 10 ++++++++++
.../org/apache/tapestry5/http/modules/TapestryHttpModule.java | 2 +-
tapestry-rest-jackson/build.gradle | 2 +-
.../tapestry5/rest/jackson/modules/RestJacksonModule.java | 10 ----------
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/build.gradle b/build.gradle
index b73e698..94e9dbf 100755
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ project.ext.versions = [
slf4j: "1.7.25",
geb: "2.0",
selenium: "3.141.59",
- jackson: "2.13.0",
+ jackson: "2.13.1",
jsonschemaGenerator: "4.20.0"
]
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 4d65f64..ce6dedb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -693,8 +693,7 @@ public class SymbolConstants
/**
* Defines the path the OpenAPI description file of this application's
REST endpoints will be
- * published. It should start with a slash. The default value is
<code>openapi.json</code>.
- * Default value is <code>/openapi.json</code>.
+ * published. It should start with a slash. Default value is
<code>/openapi.json</code>.
* The description will only be published if {{@link
#PUBLISH_OPENAPI_DEFINITON} is set to
* <code>true</code>.
* @see OpenApiDescriptionGenerator
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index df9c374..c7d8d1e 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -2760,6 +2760,16 @@ public final class TapestryModule
OrderedConfiguration<OpenApiTypeDescriber> configuration) {
configuration.addInstance("Default",
DefaultOpenApiTypeDescriber.class, "before:*");
}
+
+ /**
+ * Contributes the package "<root>.rest.entities" to the
configuration,
+ * so that it will be scanned for mapped entity classes.
+ */
+ public static void contributeMappedEntityManager(Configuration<String>
configuration,
+ @Symbol(TapestryHttpInternalConstants.TAPESTRY_APP_PACKAGE_PARAM)
String appRootPackage)
+ {
+ configuration.add(appRootPackage + ".rest.entities");
+ }
private static final class TapestryCoreComponentLibraryInfoSource
implements
ComponentLibraryInfoSource
diff --git
a/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
b/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
index 8e39574..e634086 100644
---
a/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
+++
b/tapestry-http/src/main/java/org/apache/tapestry5/http/modules/TapestryHttpModule.java
@@ -316,7 +316,7 @@ public final class TapestryHttpModule {
public static void contributeHttpRequestBodyConverter(
final OrderedConfiguration<HttpRequestBodyConverter> configuration)
{
- configuration.addInstance("TypeCoercer",
TypeCoercerHttpRequestBodyConverter.class);
+ configuration.addInstance("TypeCoercer",
TypeCoercerHttpRequestBodyConverter.class, "after:*");
}
@SuppressWarnings("rawtypes")
diff --git a/tapestry-rest-jackson/build.gradle
b/tapestry-rest-jackson/build.gradle
index 7c9498a..1c89cd9 100644
--- a/tapestry-rest-jackson/build.gradle
+++ b/tapestry-rest-jackson/build.gradle
@@ -9,6 +9,6 @@ dependencies {
jar {
manifest {
- attributes 'Tapestry-Module-Classes':
'org.apache.tapestry5.rest.jackson.services.RestJacksonModule.'
+ attributes 'Tapestry-Module-Classes':
'org.apache.tapestry5.rest.jackson.modules.RestJacksonModule'
}
}
diff --git
a/tapestry-rest-jackson/src/main/java/org/apache/tapestry5/rest/jackson/modules/RestJacksonModule.java
b/tapestry-rest-jackson/src/main/java/org/apache/tapestry5/rest/jackson/modules/RestJacksonModule.java
index 14152a4..04cd778 100644
---
a/tapestry-rest-jackson/src/main/java/org/apache/tapestry5/rest/jackson/modules/RestJacksonModule.java
+++
b/tapestry-rest-jackson/src/main/java/org/apache/tapestry5/rest/jackson/modules/RestJacksonModule.java
@@ -80,16 +80,6 @@ public class RestJacksonModule
}
/**
- * Contributes the package "<root>.rest.entities" to the
configuration,
- * so that it will be scanned for mapped entity classes.
- */
- public static void contributeMappedEntityManager(Configuration<String>
configuration,
- @Symbol(TapestryHttpInternalConstants.TAPESTRY_APP_PACKAGE_PARAM)
String appRootPackage)
- {
- configuration.add(appRootPackage + ".rest.entities");
- }
-
- /**
* Contributes {@link JacksonHttpRequestBodyConverter} to the {@link
HttpRequestBodyConverter} service.
*/
public static void contributeHttpRequestBodyConverter(
