You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/04/27 05:25:17 UTC
[tomee-jakarta] branch master updated (f0d1a5e -> 02fded0)
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git.
from f0d1a5e Merge pull request #1 from dblevins/jaxrs
new 348d1ac Restore sorting from master branch. Disable patching of org.apache.cxf.jaxrs for now
new 9e8249e Set java 1.8 as source/target in TomEE Patch Plugin
new 7cd2d32 Add org.apache.cxf.jaxrs back as patchable
new 02fded0 Re-ordered CXF sorting
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tomee/tomee-microprofile-webapp/pom.xml | 10 +-
tomee/tomee-plume-webapp/pom.xml | 5 +
tomee/tomee-plus-webapp/pom.xml | 10 +-
tomee/tomee-webprofile-webapp/pom.xml | 10 +-
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 103 +++++++++++----------
5 files changed, 78 insertions(+), 60 deletions(-)
[tomee-jakarta] 02/04: Set java 1.8 as source/target in TomEE Patch
Plugin
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit 9e8249e4add591eefc70dfd4e4b43fdc4fb9b3e9
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 22:19:57 2021 -0700
Set java 1.8 as source/target in TomEE Patch Plugin
---
tomee/tomee-microprofile-webapp/pom.xml | 10 +++++++---
tomee/tomee-plume-webapp/pom.xml | 2 ++
tomee/tomee-plus-webapp/pom.xml | 10 +++++++---
tomee/tomee-webprofile-webapp/pom.xml | 10 +++++++---
4 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 346a751..701c8af 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -470,9 +470,13 @@
<patchSources>
<source>${project.basedir}/../../transform/src/patch/java/</source>
</patchSources>
- <replacements>
- <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
- </replacements>
+ <replace>
+ <resources>
+ <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
+ </resources>
+ </replace>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
<executions>
<execution>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index b75c3d9..826c67e 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -483,6 +483,8 @@
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
</resources>
</replace>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
<executions>
<execution>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 36f2284..bdcedfd 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -500,9 +500,13 @@
<patchSources>
<source>${project.basedir}/../../transform/src/patch/java/</source>
</patchSources>
- <replacements>
- <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
- </replacements>
+ <replace>
+ <resources>
+ <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
+ </resources>
+ </replace>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
<executions>
<execution>
diff --git a/tomee/tomee-webprofile-webapp/pom.xml b/tomee/tomee-webprofile-webapp/pom.xml
index 4bce252..5530755 100644
--- a/tomee/tomee-webprofile-webapp/pom.xml
+++ b/tomee/tomee-webprofile-webapp/pom.xml
@@ -180,9 +180,13 @@
<sourceExcludes>
<exclude>org/apache/cxf</exclude>
</sourceExcludes>
- <replacements>
- <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
- </replacements>
+ <replace>
+ <resources>
+ <openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
+ </resources>
+ </replace>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
<executions>
<execution>
[tomee-jakarta] 01/04: Restore sorting from master branch. Disable
patching of org.apache.cxf.jaxrs for now
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit 348d1ac3612f8b9c74ee90104c44fdee0994c619
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 20:55:59 2021 -0700
Restore sorting from master branch. Disable patching of org.apache.cxf.jaxrs for now
---
tomee/tomee-plume-webapp/pom.xml | 3 +++
.../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 12 +++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index f402748..b75c3d9 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -469,6 +469,9 @@
<source>${project.basedir}/../../transform/src/patch/java/</source>
<!-- <source>${project.basedir}/src/patch/java/</source>-->
</patchSources>
+ <sourceExcludes>
+ <exclude>org/apache/cxf/jaxrs</exclude>
+ </sourceExcludes>
<replace>
<!-- We don't want these bytecode modified at all, so we overwrite
any modifications made by the Eclipse Transformer with the originals -->
diff --git a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 3963b5b..cabe51c 100644
--- a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -896,19 +896,21 @@ public abstract class ProviderFactory {
MessageBodyWriter<?> e1 = p1.getProvider();
MessageBodyWriter<?> e2 = p2.getProvider();
- int result = compareClasses(e1, e2);
- if (result != 0) {
- return result;
- }
List<MediaType> types1 =
JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e1), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
List<MediaType> types2 =
JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e2), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
- result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
+ int result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
if (result != 0) {
return result;
}
+
+ result = compareClasses(e1, e2);
+ if (result != 0) {
+ return result;
+ }
+
result = compareCustomStatus(p1, p2);
if (result != 0) {
return result;
[tomee-jakarta] 04/04: Re-ordered CXF sorting
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit 02fded0029241ed4ad668fcbffa3127401298206
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 22:24:59 2021 -0700
Re-ordered CXF sorting
---
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 107 ++++++++++-----------
1 file changed, 53 insertions(+), 54 deletions(-)
diff --git a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index cabe51c..fcdb084 100644
--- a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -735,18 +735,17 @@ public abstract class ProviderFactory {
* x/y;q=1.0 < x/y;q=0.7.
*/
private void sortReaders() {
- if (!customComparatorAvailable(MessageBodyReader.class)) {
- messageReaders.sort(new MessageBodyReaderComparator());
- } else {
- doCustomSort(messageReaders);
- }
+ messageReaders.sort(MessageBodyReaderComparator::sortPriorityAnnotation);
+ messageReaders.sort(MessageBodyReaderComparator::sortCustomProviders);
+ messageReaders.sort(MessageBodyReaderComparator::sortMediaTypes);
+ messageReaders.sort(MessageBodyReaderComparator::sortClasses);
}
+
private <T> void sortWriters() {
- if (!customComparatorAvailable(MessageBodyWriter.class)) {
- messageWriters.sort(new MessageBodyWriterComparator());
- } else {
- doCustomSort(messageWriters);
- }
+ messageWriters.sort(MessageBodyWriterComparator::sortPriorityAnnotation);
+ messageWriters.sort(MessageBodyWriterComparator::sortCustomProviders);
+ messageWriters.sort(MessageBodyWriterComparator::sortProduceTypes);
+ messageWriters.sort(MessageBodyWriterComparator::sortClasses);
}
private boolean customComparatorAvailable(Class<?> providerClass) {
@@ -859,64 +858,64 @@ public abstract class ProviderFactory {
setProviders(true, false, userProviders.toArray());
}
- private static class MessageBodyReaderComparator
- implements Comparator<ProviderInfo<MessageBodyReader<?>>> {
+ private static class MessageBodyReaderComparator {
+
+ public static int sortPriorityAnnotation(final ProviderInfo<MessageBodyReader<?>> p1, final ProviderInfo<MessageBodyReader<?>> p2) {
+ return comparePriorityStatus(p1.getProvider().getClass(), p2.getProvider().getClass());
+ }
- public int compare(ProviderInfo<MessageBodyReader<?>> p1,
- ProviderInfo<MessageBodyReader<?>> p2) {
+ public static int sortCustomProviders(final ProviderInfo<MessageBodyReader<?>> p1, final ProviderInfo<MessageBodyReader<?>> p2) {
+ int result;
+ result = compareCustomStatus(p1, p2);
+ return result;
+ }
+
+ public static int sortClasses(final ProviderInfo<MessageBodyReader<?>> p1, final ProviderInfo<MessageBodyReader<?>> p2) {
MessageBodyReader<?> e1 = p1.getProvider();
MessageBodyReader<?> e2 = p2.getProvider();
+ int result;
+ result = compareClasses(e1, e2);
+ return result;
+ }
- List<MediaType> types1 = JAXRSUtils.getProviderConsumeTypes(e1);
+ public static int sortMediaTypes(final ProviderInfo<MessageBodyReader<?>> p1, final ProviderInfo<MessageBodyReader<?>> p2) {
+ List<MediaType> types1 = JAXRSUtils.getProviderConsumeTypes(p1.getProvider());
types1 = JAXRSUtils.sortMediaTypes(types1, null);
- List<MediaType> types2 = JAXRSUtils.getProviderConsumeTypes(e2);
+
+ List<MediaType> types2 = JAXRSUtils.getProviderConsumeTypes(p2.getProvider());
types2 = JAXRSUtils.sortMediaTypes(types2, null);
- int result = JAXRSUtils.compareSortedMediaTypes(types1, types2, null);
- if (result != 0) {
- return result;
- }
- result = compareClasses(e1, e2);
- if (result != 0) {
- return result;
- }
- result = compareCustomStatus(p1, p2);
- if (result != 0) {
- return result;
- }
- return comparePriorityStatus(p1.getProvider().getClass(), p2.getProvider().getClass());
+ return JAXRSUtils.compareSortedMediaTypes(types1, types2, null);
}
}
- private static class MessageBodyWriterComparator
- implements Comparator<ProviderInfo<MessageBodyWriter<?>>> {
-
- public int compare(ProviderInfo<MessageBodyWriter<?>> p1,
- ProviderInfo<MessageBodyWriter<?>> p2) {
- MessageBodyWriter<?> e1 = p1.getProvider();
- MessageBodyWriter<?> e2 = p2.getProvider();
+ private static class MessageBodyWriterComparator {
- List<MediaType> types1 =
- JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e1), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
- List<MediaType> types2 =
- JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e2), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
+ public static int sortPriorityAnnotation(final ProviderInfo<MessageBodyWriter<?>> p1, final ProviderInfo<MessageBodyWriter<?>> p2) {
+ return comparePriorityStatus(p1.getProvider().getClass(), p2.getProvider().getClass());
+ }
- int result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
- if (result != 0) {
- return result;
- }
+ public static int sortCustomProviders(final ProviderInfo<MessageBodyWriter<?>> p1, final ProviderInfo<MessageBodyWriter<?>> p2) {
+ int result;
+ result = compareCustomStatus(p1, p2);
+ return result;
+ }
- result = compareClasses(e1, e2);
- if (result != 0) {
- return result;
- }
+ public static int sortClasses(final ProviderInfo<MessageBodyWriter<?>> p1, final ProviderInfo<MessageBodyWriter<?>> p2) {
+ int result;
+ result = compareClasses(p1.getProvider(), p2.getProvider());
+ return result;
+ }
- result = compareCustomStatus(p1, p2);
- if (result != 0) {
- return result;
- }
+ public static int sortProduceTypes(final ProviderInfo<MessageBodyWriter<?>> p1, final ProviderInfo<MessageBodyWriter<?>> p2) {
+ List<MediaType> types1 =
+ JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(p1.getProvider()), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
+ List<MediaType> types2 =
+ JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(p2.getProvider()), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
- return comparePriorityStatus(p1.getProvider().getClass(), p2.getProvider().getClass());
+ int result;
+ result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
+ return result;
}
}
@@ -1143,7 +1142,7 @@ public abstract class ProviderFactory {
return -1;
}
- private static Type[] getGenericInterfaces(Class<?> cls, Class<?> expectedClass) {
+ public static Type[] getGenericInterfaces(Class<?> cls, Class<?> expectedClass) {
return getGenericInterfaces(cls, expectedClass, Object.class);
}
private static Type[] getGenericInterfaces(Class<?> cls, Class<?> expectedClass,
[tomee-jakarta] 03/04: Add org.apache.cxf.jaxrs back as patchable
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit 7cd2d32a1495416b628673518c69d62c17dde70b
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 22:20:57 2021 -0700
Add org.apache.cxf.jaxrs back as patchable
---
tomee/tomee-plume-webapp/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 826c67e..36cfa50 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -469,9 +469,9 @@
<source>${project.basedir}/../../transform/src/patch/java/</source>
<!-- <source>${project.basedir}/src/patch/java/</source>-->
</patchSources>
- <sourceExcludes>
- <exclude>org/apache/cxf/jaxrs</exclude>
- </sourceExcludes>
+<!-- <sourceExcludes>-->
+<!-- <exclude>org/apache/cxf/jaxrs</exclude>-->
+<!-- </sourceExcludes>-->
<replace>
<!-- We don't want these bytecode modified at all, so we overwrite
any modifications made by the Eclipse Transformer with the originals -->