You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/04/23 09:04:00 UTC
[cxf] branch 3.3.x-fixes updated (8fa15f6 -> a7d48a2)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 8fa15f6 Recording .gitmergeinfo Changes
new 08badd4 Update Commons Lang version to 3.10
new eb8006b cxf-systests-jaxrs: update JAXRS20ClientServerBookTest
new e883ec2 update Maven minor version
new 8d0e5c3 Update to slf4j 1.7.30
new a6ba34d fix: invalid 'client_secret_expires_at' value (#661)
new c853511 Recording .gitmergeinfo Changes
new 76cf3b7 Updating Tika to 1.24.1
new 6f00c6b Recording .gitmergeinfo Changes
new a47f212 Updating Tomcat to 8.5.54
new ffbfe04 Recording .gitmergeinfo Changes
new a7d48a2 Recording .gitmergeinfo Changes
The 11 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:
.gitmergeinfo | 36 ++++
parent/pom.xml | 10 +-
.../services/ClientRegistrationResponse.java | 2 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 186 ++++++++-------------
4 files changed, 111 insertions(+), 123 deletions(-)
[cxf] 09/11: Updating Tomcat to 8.5.54
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a47f21208f890f0ee93630046cfada28c09d4005
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 08:28:34 2020 +0100
Updating Tomcat to 8.5.54
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5dda59f..a651ac8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -203,7 +203,7 @@
<cxf.swagger2.version>1.5.24</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
<cxf.tika.version>1.24.1</cxf.tika.version>
- <cxf.tomcat.version>8.5.51</cxf.tomcat.version>
+ <cxf.tomcat.version>8.5.54</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.version>2.0.30.Final</cxf.undertow.version>
[cxf] 05/11: fix: invalid 'client_secret_expires_at' value (#661)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a6ba34dcc2d8a067fcb2ba943672e21f6e1fabca
Author: ParanoidUser <pi...@gmail.com>
AuthorDate: Wed Apr 22 23:06:06 2020 -0700
fix: invalid 'client_secret_expires_at' value (#661)
use CLIENT_SECRET_EXPIRES_AT contant instead
(cherry picked from commit 8823c8030974d54465f1c17c355f0da3656b19d2)
---
.../cxf/rs/security/oauth2/services/ClientRegistrationResponse.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ClientRegistrationResponse.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ClientRegistrationResponse.java
index 7ff3936..0481e31 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ClientRegistrationResponse.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ClientRegistrationResponse.java
@@ -73,7 +73,7 @@ public class ClientRegistrationResponse extends JsonMapObject {
return getLongProperty(CLIENT_ID_ISSUED_AT);
}
public void setClientSecretExpiresAt(Long expiresAt) {
- super.setProperty(CLIENT_ID_ISSUED_AT, expiresAt);
+ super.setProperty(CLIENT_SECRET_EXPIRES_AT, expiresAt);
}
public Long getClientSecretExpiresAt() {
return getLongProperty(CLIENT_SECRET_EXPIRES_AT);
[cxf] 04/11: Update to slf4j 1.7.30
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8d0e5c39cda660bf32165ebf77ca3d98a250281b
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Apr 16 12:42:34 2020 +0300
Update to slf4j 1.7.30
(cherry picked from commit 2e3258cfa57a93b92d5ab17ce85a66ce9bdd5ffe)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ef3f58c..f6d440d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,7 +188,7 @@
<cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
- <cxf.slf4j.version>1.7.29</cxf.slf4j.version>
+ <cxf.slf4j.version>1.7.30</cxf.slf4j.version>
<cxf.snakeyaml.version>1.26</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.boot.version>2.1.13.RELEASE</cxf.spring.boot.version>
[cxf] 01/11: Update Commons Lang version to 3.10
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 08badd4764c1a9963da803f663c6ea1b36646181
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Mar 29 19:55:47 2020 +0200
Update Commons Lang version to 3.10
(cherry picked from commit 5fdadf993bdca0f431ebd4ecb07c0f535fa72ae7)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0174901..2358d6b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
<cxf.commons-codec.version>1.14</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
<cxf.commons-jcs-jcache.version>2.1</cxf.commons-jcs-jcache.version>
- <cxf.commons-lang3.version>3.9</cxf.commons-lang3.version>
+ <cxf.commons-lang3.version>3.10</cxf.commons-lang3.version>
<cxf.commons-logging.version>1.2</cxf.commons-logging.version>
<cxf.commons-text.version>1.8</cxf.commons-text.version>
<cxf.derby.version>10.14.2.0</cxf.derby.version>
[cxf] 07/11: Updating Tika to 1.24.1
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 76cf3b7cb8593f520fa48150391158c1849cf489
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 07:06:31 2020 +0100
Updating Tika to 1.24.1
(cherry picked from commit 4b43096d1d79d3ba8e169eff1f09b38ea3ec929e)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f6d440d..5dda59f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,7 +202,7 @@
<cxf.swagger.v3.version>2.0.10</cxf.swagger.v3.version>
<cxf.swagger2.version>1.5.24</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
- <cxf.tika.version>1.24</cxf.tika.version>
+ <cxf.tika.version>1.24.1</cxf.tika.version>
<cxf.tomcat.version>8.5.51</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
[cxf] 10/11: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ffbfe046bfcb54613fad544b09056b93027c9bbf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 10:03:25 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e4f50d4..c3bfa0b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -4,6 +4,7 @@ B 00a83132af1d549508159d503aa6b171c8607341
B 07a8053b1ff92a1d8c59f51098b691c65d23eed3
B 08164e1f0e07c222ae45d320973401833df6ab9c
B 0919568ba259baba9c7cfd3823516d880644804c
+B 0af6ac03b35075a5729023ab3b15c8daf1a55347
B 0b1c413071a7c4c933667d6ab21e2bb51252163c
B 0b7580839ddcd7879aa3f14576ea959a1aa872bc
B 0bd7ffeb9e599718ff1279f1b86df7c1e13a8ca4
@@ -69,6 +70,7 @@ B 48706603e30f076362ffd4f87b5d36b6ef83dbf5
B 49337a77156dafaa0107eee775905308fdd40bf5
B 49a3be1484462eec124524805e7439906fb18a33
B 49d34cf3a1583932779d39766b055bf49359da53
+B 4a56c1e3444b4c8dc51e2f919439c891c63bd903
B 4b1c1cb13fe6fa05eb27c6ad7a3393d1c3ec1ec1
B 4ba8ca20314da9a581f1e9a17cec5f14a210f55f
B 4bae9bec5790652c8d91fab66510ae7395c1f32f
@@ -86,17 +88,21 @@ B 5bc1e0eee7a74f7b47f3c9a4358c56c2f01090f8
B 5c81c3e82990ae0906a6e2b48746726f894618a1
B 5ed3a96ad977357f58f8ec997a9639e40a2da454
B 5fd6e467773b092a0327fef64fd4c9e4cce5f6e1
+B 61c6740c967ffa2771f1b82b50a57390d502aa5e
B 62e828c7e74d0dd5d4e337a090344a13501d8aeb
+B 62f10357e3ad98e921201fdb8e68d373d98c3f7d
B 64584f32c8a4632344a1e062e0fc969dfd88e41e
B 64915c3d36d6ef2bef8168e912a9b8977b5b2330
B 65869badeefe7eedd60fbc8b7d7c614a3c6d59a8
B 67715076cb7d245aaf2d3a2442a40349d354e323
B 67dbf83ef2f7a207a6374fec9775c481fe9afc53
B 68d21206e618130aa5c0b05053a1a64e38feb2d7
+B 694741b2a1e38f20fdb80b5b9470be7772859c52
B 6bc7f0cc09395effeaa57ee92e4b8c5dce5c00a6
B 6c368654075cfc80a6b59903fd0ae343f2cd5fff
B 6d59a806aca3cd81e7e86df401afd771274c3141
B 6dd6377021ac0b9b586a0c579c3adfd6950936c8
+B 6f9303c1e94800ac453cc10e5268024fd2831418
B 6fbaddee67676f9840405bd49cb7d6e08a81bd23
B 707e2376a798a65ed2f71c34d9f351d481396381
B 71b0cee7b2148af88c005cccd4c46f64ffbf62dd
@@ -107,6 +113,7 @@ B 75e9ae0a7d31c14098e821e723cd766aa1e88785
B 760cbae3a958897bdad61aa6779a1677e1bfb53e
B 76788075f6aea8ac10b3f34f7c1c026e11faea80
B 7689d884a64db0352cdb1ac9ee0628a26491f35a
+B 79dafbdce5b2d2f11e01946d794dd85eba4936e6
B 7b333d06910b3d4a84dd77a3c76b48d1b44525b3
B 7f20ddfabf5b2ed4c84b1ae6a1cac715f8d6b076
B 80b32bb41504ecf23eaafb1d62aac8c9c3f5d405
@@ -125,8 +132,10 @@ B 9196f3364085c9f9ba6319d7b068d44206b0e290
B 930e6e5cbd64279a356560100090f04d81941182
B 93246fa3f82bac472901b31ba963bd4dfbca17e6
B 9387c3f65862bbe9356457ad4c111eda852fcc90
+B 95dc2d0e6f99d1b73a8f46197ef06d03c8d5bd87
B 964573a4d386339fd38a21885317ddfe338fd7a6
B 9762b77f128768aabd70c53ec00572e0f5f37adb
+B 97e891d42136dea99739c573599d37a597f72e46
B 97efd8a63848811f38a9a6d2f01a7910f39a584a
B 997eed0a4bc68445fe46dcf093548e04b17e1566
B 9be0ff566caa784807bd89e7c6996a4405ac59d7
@@ -147,6 +156,7 @@ B ab3df13b8d15aa36365eb2e10b5961d17330d9a2
B ac56abee9c1256742bbcfe45afbd4fdf6585da55
B adb1b8b6280a738f3b2b4f6ea40ee902d94cc2dd
B ae963c2258b8501f104387891d8de424d0ecc398
+B b5d0c54ed4f8d647e2094807f54470ada0e11c99
B b62c25d8dd293a0bdb06fbb8592c799f9124984a
B babe9c65a752d24e959545c9484e29dfc480eac1
B bb5ca3b0f6b2e74912f6f4ec94c36f8fc9a6595b
@@ -156,7 +166,9 @@ B bcb2af94957d033fa033a94d97cedf7d69ad33b4
B bed309fcae7514d6bd7fccbc6c9d9835a7a39625
B c49b6d578e4f33df736eeec46e10950c46a9278b
B c598ecf38e4d796ffb35288de39827a609d035be
+B c6b87a0eadcd26dbe6341a44ec510dd039d9956f
B c7dff867998da49669f259f6d8f1703684ce685a
+B c87876c488b99de32e2dfb0ace27c43ef70f647b
B c8b20754eaeb69380e7c64aca6ada409952cbbed
B c9a2275276c6f8099585519372c24fda1cd7c3e0
B caf6f42bc5bc589c0bff0e8042d801bd17e08c91
@@ -184,6 +196,7 @@ B eff15d982722111d5da87591bd115cefefe944df
B f0a556673f0a999dcdf5d9882a86a48120240594
B f0ad8c3079c37c7f1b9eaf0be0ee42ff5ddf5325
B f1f26101d421e30560b6da5f125852708774718b
+B f1fa1e7826b5f26fdf8f157914e69adfe9eb5bd5
B f201f1e7d218f2bb26424628b09a0bb384bce28f
B f2208f20249b6598134e2b0885d87ab75817f2e2
B f2da164e0733a14f967f3726166855d3a91eece8
@@ -244,6 +257,7 @@ M 7ef814556d727c147d6f625cbb1170edfd24a752
M 92a00fc05e2437d2d0cf98099060ba4e1f6dac99
M 95c3c37092751b1d00b6f2c26642f18ebcbba878
M 972a2755ca85ba86f473b0ce46f23bf6193ced62
+M 9c2721f27e9697fa0f515e0787f75c26077d0572
M 9c37b6c321f06621334076cc61b5b31b237f634d
M 9c462e9bd614d529f0a2fd86490243ea1c858651
M a4fc3a0462f09dd6c6c920385b67e621d7e36399
[cxf] 02/11: cxf-systests-jaxrs: update JAXRS20ClientServerBookTest
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit eb8006be87943ce5b014e1bc3edc3db15eb3130e
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Mar 19 16:11:09 2020 +0300
cxf-systests-jaxrs: update JAXRS20ClientServerBookTest
(cherry picked from commit c82d702e6913b758c745dd2ff5c8c52ad7f8de6d)
---
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 186 ++++++++-------------
1 file changed, 69 insertions(+), 117 deletions(-)
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index 81e4ed7..845f196 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.net.URI;
import java.net.UnknownHostException;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -347,13 +347,12 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
wc.accept("application/xml").type("application/xml");
GenericEntity<List<Book>> collectionEntity = createGenericEntity();
- final Holder<Book> holder = new Holder<>();
- InvocationCallback<Book> callback = createCallback(holder);
+ BookInvocationCallback callback = new BookInvocationCallback();
Future<Book> future = wc.post(collectionEntity, callback);
Book book = future.get();
assertEquals(200, wc.getResponse().getStatus());
- assertSame(book, holder.value);
+ assertSame(book, callback.value());
assertNotSame(collectionEntity.getEntity().get(0), book);
assertEquals(collectionEntity.getEntity().get(0).getName(), book.getName());
}
@@ -366,14 +365,13 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
wc.accept("application/xml").type("application/xml");
GenericEntity<List<Book>> collectionEntity = createGenericEntity();
- final Holder<Book> holder = new Holder<>();
- InvocationCallback<Book> callback =
- new GenericInvocationCallback<Book>(holder) { };
+ GenericInvocationCallback<Book> callback = new GenericInvocationCallback<Book>(new Holder<>()) {
+ };
Future<Book> future = wc.post(collectionEntity, callback);
Book book = future.get();
assertEquals(200, wc.getResponse().getStatus());
- assertSame(book, holder.value);
+ assertSame(book, callback.value());
assertNotSame(collectionEntity.getEntity().get(0), book);
assertEquals(collectionEntity.getEntity().get(0).getName(), book.getName());
}
@@ -383,19 +381,18 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections3";
- WebClient wc = WebClient.create(endpointAddress);
- wc.accept("application/xml");
+ WebClient wc = WebClient.create(endpointAddress)
+ .accept("application/xml");
GenericEntity<List<Book>> collectionEntity = createGenericEntity();
- final Holder<Book> holder = new Holder<>();
- InvocationCallback<Book> callback = createCallback(holder);
+ BookInvocationCallback callback = new BookInvocationCallback();
Future<Book> future = wc.async().post(Entity.entity(collectionEntity, "application/xml"),
callback);
Book book = future.get();
assertEquals(200, wc.getResponse().getStatus());
- assertSame(book, holder.value);
+ assertSame(book, callback.value());
assertNotSame(collectionEntity.getEntity().get(0), book);
assertEquals(collectionEntity.getEntity().get(0).getName(), book.getName());
}
@@ -412,7 +409,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
}
@Test
- public void testPostReplaceBookMistypedCT() throws Exception {
+ public void testPostReplaceBookMistypedAT() throws Exception {
String endpointAddress = "http://localhost:" + PORT + "/bookstore/books2";
WebClient wc = WebClient.create(endpointAddress,
@@ -423,7 +420,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
}
@Test
- public void testReplaceBookMistypedCTAndHttpVerb() throws Exception {
+ public void testReplaceBookMistypedATAndHttpVerb() throws Exception {
String endpointAddress = "http://localhost:" + PORT + "/bookstore/books2/mistyped";
WebClient wc = WebClient.create(endpointAddress,
@@ -433,7 +430,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
assertEquals(561L, book.getId());
}
@Test
- public void testReplaceBookMistypedCTAndHttpVerb2() throws Exception {
+ public void testReplaceBookMistypedATAndHttpVerb2() throws Exception {
String endpointAddress = "http://localhost:" + PORT + "/bookstore/books2/mistyped";
WebClient wc = WebClient.create(endpointAddress,
@@ -449,7 +446,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections";
WebClient wc = WebClient.create(endpointAddress);
- doTestPostGetCollectionGenericEntityAndType(wc, "application/xml");
+ doTestPostGetCollectionGenericEntityAndType(wc, MediaType.APPLICATION_XML_TYPE);
}
@Test
public void testPostGetCollectionGenericEntityAndTypeJson() throws Exception {
@@ -458,17 +455,16 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
"http://localhost:" + PORT + "/bookstore/collections";
WebClient wc = WebClient.create(endpointAddress,
Collections.singletonList(new JacksonJaxbJsonProvider()));
- doTestPostGetCollectionGenericEntityAndType(wc, "application/json");
+ doTestPostGetCollectionGenericEntityAndType(wc, MediaType.APPLICATION_JSON_TYPE);
}
- private void doTestPostGetCollectionGenericEntityAndType(WebClient wc, String mt) throws Exception {
+ private void doTestPostGetCollectionGenericEntityAndType(WebClient wc, MediaType mediaType) throws Exception {
- wc.accept(mt).type(mt);
+ wc.accept(mediaType).type(mediaType);
GenericEntity<List<Book>> collectionEntity = createGenericEntity();
- final Holder<List<Book>> holder = new Holder<>();
- InvocationCallback<List<Book>> callback = new CustomInvocationCallback(holder);
+ InvocationCallback<List<Book>> callback = new ListBookInvocationCallback();
- Future<List<Book>> future = wc.async().post(Entity.entity(collectionEntity, mt),
+ Future<List<Book>> future = wc.async().post(Entity.entity(collectionEntity, mediaType),
callback);
List<Book> books2 = future.get();
@@ -544,46 +540,12 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
assertEquals(200, wc.getResponse().getStatus());
}
- private GenericEntity<List<Book>> createGenericEntity() {
- Book b1 = new Book("CXF in Action", 123L);
- Book b2 = new Book("CXF Rocks", 124L);
- List<Book> books = new ArrayList<>();
- books.add(b1);
- books.add(b2);
- return new GenericEntity<List<Book>>(books) {
- };
+ private static GenericEntity<List<Book>> createGenericEntity() {
+ return new GenericEntity<List<Book>>(Arrays.asList(
+ new Book("CXF in Action", 123L),
+ new Book("CXF Rocks", 124L))) { };
}
- private InvocationCallback<Book> createCallback(final Holder<Book> holder) {
- return new InvocationCallback<Book>() {
- public void completed(Book response) {
- holder.value = response;
- }
- public void failed(Throwable error) {
- error.printStackTrace();
- }
- };
- }
-
-
- private static class CustomInvocationCallback implements InvocationCallback<List<Book>> {
- private Holder<List<Book>> holder;
- CustomInvocationCallback(Holder<List<Book>> holder) {
- this.holder = holder;
- }
-
- @Override
- public void completed(List<Book> books) {
- holder.value = books;
-
- }
-
- @Override
- public void failed(Throwable arg0) {
-
- }
-
- }
private static class GenericInvocationCallback<T> implements InvocationCallback<T> {
private Holder<T> holder;
GenericInvocationCallback(Holder<T> holder) {
@@ -593,14 +555,27 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
@Override
public void completed(T book) {
holder.value = book;
-
}
@Override
- public void failed(Throwable arg0) {
+ public void failed(Throwable throwable) {
+ }
+ public T value() {
+ return holder.value;
}
+ }
+ private static class BookInvocationCallback extends GenericInvocationCallback<Book> {
+ BookInvocationCallback() {
+ super(new Holder<Book>());
+ }
+ }
+
+ private static class ListBookInvocationCallback extends GenericInvocationCallback<List<Book>> {
+ ListBookInvocationCallback() {
+ super(new Holder<List<Book>>());
+ }
}
private void doTestGetBook(String address, boolean useAsync) {
@@ -613,20 +588,18 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
validateResponse(wc);
}
- private WebClient createWebClient(String address) {
- List<Object> providers = new ArrayList<>();
- providers.add(new ClientHeaderRequestFilter());
- providers.add(new ClientHeaderResponseFilter());
- return WebClient.create(address, providers);
+ private static WebClient createWebClient(String address) {
+ return WebClient.create(address, Arrays.asList(
+ new ClientHeaderRequestFilter(),
+ new ClientHeaderResponseFilter()));
}
- private WebClient createWebClientPost(String address) {
- List<Object> providers = new ArrayList<>();
- providers.add(new ClientHeaderRequestFilter());
- providers.add(new ClientHeaderResponseFilter());
- providers.add(new ClientReaderInterceptor());
- providers.add(new ClientWriterInterceptor());
- return WebClient.create(address, providers);
+ private static WebClient createWebClientPost(String address) {
+ return WebClient.create(address, Arrays.asList(
+ new ClientHeaderRequestFilter(),
+ new ClientHeaderResponseFilter(),
+ new ClientReaderInterceptor(),
+ new ClientWriterInterceptor()));
}
private void doTestGetBookAsync(String address, boolean asyncInvoker)
@@ -634,12 +607,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
WebClient wc = createWebClient(address);
- final Holder<Book> holder = new Holder<>();
- InvocationCallback<Book> callback = createCallback(holder);
+ final BookInvocationCallback callback = new BookInvocationCallback();
Future<Book> future = asyncInvoker ? wc.async().get(callback) : wc.get(callback);
Book book = future.get();
- assertSame(book, holder.value);
+ assertSame(book, callback.value());
assertEquals(124L, book.getId());
validateResponse(wc);
}
@@ -649,18 +621,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
WebClient wc = createWebClientPost(address);
- final Holder<Book> holder = new Holder<>();
- final InvocationCallback<Book> callback = new InvocationCallback<Book>() {
- public void completed(Book response) {
- holder.value = response;
- }
- public void failed(Throwable error) {
- }
- };
+ final BookInvocationCallback callback = new BookInvocationCallback();
Future<Book> future = wc.post(new Book("async", 126L), callback);
Book book = future.get();
- assertSame(book, holder.value);
+ assertSame(book, callback.value());
assertEquals(124L, book.getId());
validatePostResponse(wc, true, false);
}
@@ -671,14 +636,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
WebClient wc = createWebClient(address);
wc.accept(MediaType.APPLICATION_XML_TYPE);
- final Holder<Response> holder = new Holder<>();
- final InvocationCallback<Response> callback = new InvocationCallback<Response>() {
- public void completed(Response response) {
- holder.value = response;
- }
- public void failed(Throwable error) {
- }
- };
+ final InvocationCallback<Response> callback = new GenericInvocationCallback<>(new Holder<>());
Future<Response> future = asyncInvoker ? wc.async().get(callback) : wc.get(callback);
Book book = future.get().readEntity(Book.class);
@@ -686,7 +644,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
validateResponse(wc);
}
- private void validateResponse(WebClient wc) {
+ private static void validateResponse(WebClient wc) {
Response response = wc.getResponse();
assertEquals("OK", response.getHeaderString("Response"));
assertEquals("OK2", response.getHeaderString("Response2"));
@@ -699,7 +657,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
assertEquals("http://localhost/redirect", response.getHeaderString(HttpHeaders.LOCATION));
}
- private void validatePostResponse(WebClient wc, boolean async, boolean bodyEmpty) {
+ private static void validatePostResponse(WebClient wc, boolean async, boolean bodyEmpty) {
validateResponse(wc);
Response response = wc.getResponse();
assertEquals(!async ? "serverRead" : "serverReadAsync",
@@ -715,10 +673,9 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
@Test
public void testClientFiltersLocalResponse() {
String address = "http://localhost:" + PORT + "/bookstores";
- List<Object> providers = new ArrayList<>();
- providers.add(new ClientCacheRequestFilter());
- providers.add(new ClientHeaderResponseFilter(true));
- WebClient wc = WebClient.create(address, providers);
+ WebClient wc = WebClient.create(address, Arrays.asList(
+ new ClientCacheRequestFilter(),
+ new ClientHeaderResponseFilter(true)));
Book theBook = new Book("Echo", 123L);
Response r = wc.post(theBook);
assertEquals(201, r.getStatus());
@@ -730,17 +687,14 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
@Test
public void testClientFiltersLocalResponseLambdas() {
String address = "http://localhost:" + PORT + "/bookstores";
- List<Object> providers = new ArrayList<>();
-
- providers.add((ClientRequestFilter) ctx -> {
- ctx.abortWith(Response.status(201).entity(ctx.getEntity()).type(MediaType.TEXT_XML_TYPE).build());
- });
-
- providers.add((ClientResponseFilter) (reqContext, respContext) -> {
- MultivaluedMap<String, String> headers = respContext.getHeaders();
- headers.putSingle(HttpHeaders.LOCATION, "http://localhost/redirect");
- });
- WebClient wc = WebClient.create(address, providers);
+ WebClient wc = WebClient.create(address, Arrays.asList(
+ (ClientRequestFilter) ctx -> {
+ ctx.abortWith(Response.status(201).entity(ctx.getEntity()).type(MediaType.TEXT_XML_TYPE).build());
+ },
+ (ClientResponseFilter) (reqContext, respContext) -> {
+ MultivaluedMap<String, String> headers = respContext.getHeaders();
+ headers.putSingle(HttpHeaders.LOCATION, "http://localhost/redirect");
+ }));
Book theBook = new Book("Echo", 123L);
Response r = wc.post(theBook);
assertEquals(201, r.getStatus());
@@ -826,11 +780,9 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
Book b1 = new Book("CXF in Action", 123L);
Book b2 = new Book("CXF Rocks", 124L);
- List<JAXBElement<Book>> books = new ArrayList<>();
- books.add(new JAXBElement<Book>(new QName("bookRootElement"),
- Book.class, b1));
- books.add(new JAXBElement<Book>(new QName("bookRootElement"),
- Book.class, b2));
+ List<JAXBElement<Book>> books = Arrays.asList(
+ new JAXBElement<Book>(new QName("bookRootElement"), Book.class, b1),
+ new JAXBElement<Book>(new QName("bookRootElement"), Book.class, b2));
GenericEntity<List<JAXBElement<Book>>> collectionEntity =
new GenericEntity<List<JAXBElement<Book>>>(books) { };
[cxf] 03/11: update Maven minor version
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e883ec2ab58f124c1991716d04fea2ddc9795ea1
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Apr 19 12:11:03 2020 +0200
update Maven minor version
(cherry picked from commit 375b065fa6c6fdc73b2d137654f5b60cc3464793)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2358d6b..ef3f58c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -159,7 +159,7 @@
<cxf.log4j.version>1.2.17</cxf.log4j.version>
<cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
<cxf.lucene.version>4.9.1</cxf.lucene.version>
- <cxf.maven.core.version>3.6.2</cxf.maven.core.version>
+ <cxf.maven.core.version>3.6.3</cxf.maven.core.version>
<cxf.microprofile.config.version>1.1</cxf.microprofile.config.version>
<cxf.microprofile.rest.client.version>1.4.1</cxf.microprofile.rest.client.version>
<cxf.mina.version>2.0.21</cxf.mina.version>
[cxf] 06/11: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c85351139817b7d7d2ce3e633fc4cfc472a92e2c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 08:20:23 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ef5509e..2c84806 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -3,6 +3,7 @@ origin/master
B 00a83132af1d549508159d503aa6b171c8607341
B 07a8053b1ff92a1d8c59f51098b691c65d23eed3
B 08164e1f0e07c222ae45d320973401833df6ab9c
+B 0919568ba259baba9c7cfd3823516d880644804c
B 0b1c413071a7c4c933667d6ab21e2bb51252163c
B 0b7580839ddcd7879aa3f14576ea959a1aa872bc
B 0bd7ffeb9e599718ff1279f1b86df7c1e13a8ca4
@@ -17,8 +18,11 @@ B 11de1e0dfff9a8f9b157e23983c8e25f8503f868
B 1279837f4879cb5446ae402cec432010455151fa
B 129a02d671c9aa0bcbb3be1ffd732d7937583667
B 12b0c595a03e0fed09fbc2d4ee37e0ee15fe4432
+B 12b80dcd143a56a0d4ee33e22633a4f0a435216e
+B 12e20a5147f57dde28c1cfb08acbf1ccd8ba3402
B 1448dd059193dac0a975520707ae98b1fe3a7e18
B 16c1d31b17b310d32d24676d3aca9c2b80c866ee
+B 16e0e3d42fa3cb27fa289cbfe87f90855649dc32
B 16e862032f3de1cf52a5b28e099cd35b7ce7b7ce
B 180fbbbd5571840b5f7a09ab7c0ce59605edd346
B 1bd346333d234ca3601274550d5438c41f4c38f4
@@ -38,8 +42,10 @@ B 277430f6673140643a5593b979316ff981839b2b
B 27ad3c89dee2280c2c19955696603b8411af0c10
B 2851ffc7f9980fb03b5bd498ee837749414c8664
B 2bd5324d6d09e35345af4013bb5f4f07113b03d2
+B 2cff3ce96abb43a5171d047984a47a37c1c2ea68
B 2d159906f9b9fd756a4a94053b360552a679cf9d
B 2e7278c35f3fadc94e03dcf8c9b10a5f46053fce
+B 2e7df5d8cdbc5b1bb596ced069e80d85b0284b10
B 2f47c807b37758e10fb2d6c7746fd3f40451b566
B 314b148a9b6e80d743d92cad4d56991623386980
B 324e838b6faf233f9d0c5b2ad618cbe92c39bbcf
@@ -53,12 +59,14 @@ B 3cd982b47033b6fe860e1b949ac9014762b5aa13
B 3e5825057de2a8aacc06a5707649424cc62043df
B 3fc146580f43a0d7edad85318cdb6953922bdd5d
B 407eeb0dea157eaa0635d0c37a7ed95463b5638f
+B 4081929343f61ee4a1a54de157ba4aa713a6494f
B 411fb51bccd3869a97e9e807f14f50ca6b1f2a10
B 4213f7508f14d7cc8c489981831458619418921b
B 432c6a3cbc9bb5db99a0c7822c80001338746e08
B 44a930752c799a6e784ad598079b80bd99efa362
B 47ac71e69df225baf6dbf2e201810c5b87072af8
B 48706603e30f076362ffd4f87b5d36b6ef83dbf5
+B 49337a77156dafaa0107eee775905308fdd40bf5
B 49a3be1484462eec124524805e7439906fb18a33
B 49d34cf3a1583932779d39766b055bf49359da53
B 4b1c1cb13fe6fa05eb27c6ad7a3393d1c3ec1ec1
@@ -74,6 +82,7 @@ B 51417a1665d065a7135ade76423c0c5867b142bb
B 540e471660ed79cb88771f6c9a0022cbede241ac
B 56b1c952f4099d5831b0973cceb4f8f9deac9854
B 582c88e62f3e002478fa31b107f7113a004a5aa3
+B 5bc1e0eee7a74f7b47f3c9a4358c56c2f01090f8
B 5c81c3e82990ae0906a6e2b48746726f894618a1
B 5ed3a96ad977357f58f8ec997a9639e40a2da454
B 5fd6e467773b092a0327fef64fd4c9e4cce5f6e1
@@ -84,6 +93,7 @@ B 65869badeefe7eedd60fbc8b7d7c614a3c6d59a8
B 67715076cb7d245aaf2d3a2442a40349d354e323
B 67dbf83ef2f7a207a6374fec9775c481fe9afc53
B 68d21206e618130aa5c0b05053a1a64e38feb2d7
+B 6bc7f0cc09395effeaa57ee92e4b8c5dce5c00a6
B 6c368654075cfc80a6b59903fd0ae343f2cd5fff
B 6d59a806aca3cd81e7e86df401afd771274c3141
B 6dd6377021ac0b9b586a0c579c3adfd6950936c8
@@ -134,6 +144,7 @@ B a842a33554e8d26b4a42dc1e1734fc9dc0a21067
B a8ae6bc86b0285196b523f2fc8b2431dd11f2c67
B aa403a00d26475885f8d2f0da74aac87a531cbc6
B ab3df13b8d15aa36365eb2e10b5961d17330d9a2
+B ac56abee9c1256742bbcfe45afbd4fdf6585da55
B adb1b8b6280a738f3b2b4f6ea40ee902d94cc2dd
B ae963c2258b8501f104387891d8de424d0ecc398
B b62c25d8dd293a0bdb06fbb8592c799f9124984a
@@ -141,14 +152,17 @@ B babe9c65a752d24e959545c9484e29dfc480eac1
B bb5ca3b0f6b2e74912f6f4ec94c36f8fc9a6595b
B bc1848e5686a87355563e50dd12abfa38c84adaa
B bc4ea132eafb8d6668b07667f7acfcd94f1f7d62
+B bcb2af94957d033fa033a94d97cedf7d69ad33b4
B bed309fcae7514d6bd7fccbc6c9d9835a7a39625
B c49b6d578e4f33df736eeec46e10950c46a9278b
B c598ecf38e4d796ffb35288de39827a609d035be
B c7dff867998da49669f259f6d8f1703684ce685a
B c8b20754eaeb69380e7c64aca6ada409952cbbed
B c9a2275276c6f8099585519372c24fda1cd7c3e0
+B caf6f42bc5bc589c0bff0e8042d801bd17e08c91
B cc4ea93826655c45eb5dd65290300ee42fe8d596
B cdf7685cf7a7583ee076e97706d82d5271f582b1
+B ce23b6688cbb6f88f575a8471e9ce84dfb534bc5
B d076d4494d96d268a196d4d48602b36d7086680d
B d0ab91453608304dd9284aea3e7a9a829d755fdc
B d34a270473c308bd8f51d4a518ea7933a1db4e46
@@ -163,6 +177,7 @@ B dfa8498a7b56028f0baf745d1e57eb812cbfc3cd
B e68d173f7d3ca15603a8f9eff9c8b39783207f70
B e6ca654a67a3f4449fa9eed492766bdbce485e85
B e6d432be93022b5b4ac1998a546d0652861fdff3
+B e73daaaa4a04c3d29c9280934a4ca7a81abb7729
B e75756033fcb6f393fc725d13a5241c462add1d9
B ef7f9b1d16ec71ea1186701e20818607ce7d2bba
B eff15d982722111d5da87591bd115cefefe944df
@@ -172,6 +187,7 @@ B f1f26101d421e30560b6da5f125852708774718b
B f201f1e7d218f2bb26424628b09a0bb384bce28f
B f2208f20249b6598134e2b0885d87ab75817f2e2
B f2da164e0733a14f967f3726166855d3a91eece8
+B f4f227be9a1c4f31817a62fad7fff382d3089621
B f54062eb331fcf35d9f3a840f532417fccbb2673
B f68556e5b8f2fb54a6e42c48068bfc3a85996720
B f965e4917e440327abeb067c6d24ce9292f77f23
@@ -194,8 +210,10 @@ M 22a365b929822d1dbe157e0f22d228cfec21e6e2
M 29f9d03b69ee071d3b83e4f0509a6b6e01b96564
M 2a5629fc31676b9397233fa4819d7810bd2482ae
M 2cde96f38fc835f7d0eb1e303037e572110c3399
+M 2e3258cfa57a93b92d5ab17ce85a66ce9bdd5ffe
M 325ed0436bc9cfa9150b3504a54b5911b47e3266
M 330f0f9d83c5e689a8db3c107b3d27a294161bbb
+M 375b065fa6c6fdc73b2d137654f5b60cc3464793
M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
M 3dfe11c866073ff93951dac2b94e0f8e8e464b27
M 464e41a12dea11a00c86a370b31d7a7f009cb8e9
@@ -210,6 +228,7 @@ M 59ba4821c92146723df063f9eb6e1c3ae0be5834
M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
M 5e511db3de3e44f19ad1828c36edbf56f8d01eff
M 5ed6310b1621f8a61172c3be85ab66af0310af67
+M 5fdadf993bdca0f431ebd4ecb07c0f535fa72ae7
M 61aeaff2d747379c64cdad40f82cf51e3bfaecf6
M 67643a4fe883f5d6067d4ce07f48cf4de10be9f7
M 69b805a97fa96716c8f76278e577ba122c2727e2
[cxf] 08/11: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6f00c6b64df88cb4559e832c2fec3c07515b0731
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 08:21:25 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2c84806..e4f50d4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -220,6 +220,7 @@ M 464e41a12dea11a00c86a370b31d7a7f009cb8e9
M 4699995c6ef392a98615382a5824dda0d1bbe9bf
M 49b765b1424d097757a53e4dbfadcde285a7a884
M 49c1ca37a066dbfe0f4f32313da7ee4cdce61a15
+M 4b43096d1d79d3ba8e169eff1f09b38ea3ec929e
M 4d95d191ad25559deca8d5f010d5021446c1beed
M 528b35178ec31860cf5ad2095d6f3cc3c951d914
M 55abc6f8416fd81f26627fa42a37f903f9ef7965
[cxf] 11/11: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a7d48a2281da80ca05ae56a64be40351a3174d9d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 23 10:03:45 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c3bfa0b..6fa2177 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -113,6 +113,7 @@ B 75e9ae0a7d31c14098e821e723cd766aa1e88785
B 760cbae3a958897bdad61aa6779a1677e1bfb53e
B 76788075f6aea8ac10b3f34f7c1c026e11faea80
B 7689d884a64db0352cdb1ac9ee0628a26491f35a
+B 797fa441e318dfa1214f7edaa6e090cd52095bae
B 79dafbdce5b2d2f11e01946d794dd85eba4936e6
B 7b333d06910b3d4a84dd77a3c76b48d1b44525b3
B 7f20ddfabf5b2ed4c84b1ae6a1cac715f8d6b076
@@ -181,6 +182,7 @@ B d34a270473c308bd8f51d4a518ea7933a1db4e46
B d4d4b1e740a48103811e33094adb19d5c22ca108
B d9fd7f1a0439d93db7d89f1ae1bc87e7b12c05ec
B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
+B daf7c2a073f8ae11613bc8e2f02a2225f6162d5f
B de03dfae71010bd3719430d8d7453732f4c151ea
B de393404c3c2e6b0f2d93f11f5fef0c53385d57d
B de494a4f2bd3f2a99a7ddf57213bec3afe2b8300