You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/07/11 16:38:36 UTC
[1/2] cxf git commit: [CXF-7440] Adding the variants as part of
build() too
Repository: cxf
Updated Branches:
refs/heads/master e0bbfe4a0 -> 4be704469
[CXF-7440] Adding the variants as part of build() too
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/85e75210
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/85e75210
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/85e75210
Branch: refs/heads/master
Commit: 85e75210eda97bc9e31b6c2ace07865e4df0ef86
Parents: 30ac794
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Jul 11 17:37:55 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Jul 11 17:37:55 2017 +0100
----------------------------------------------------------------------
.../cxf/jaxrs/impl/VariantListBuilderImpl.java | 1 +
.../jaxrs/impl/VariantListBuilderImplTest.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/85e75210/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
index ce1cc2d..a2cce93 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
@@ -49,6 +49,7 @@ public class VariantListBuilderImpl extends VariantListBuilder {
@Override
public List<Variant> build() {
+ addVariants();
List<Variant> vs = new ArrayList<>(variants);
reset();
return vs;
http://git-wip-us.apache.org/repos/asf/cxf/blob/85e75210/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
index 1a7d8a9..572d39e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImplTest.java
@@ -47,6 +47,24 @@ public class VariantListBuilderImplTest extends Assert {
assertTrue(verifyVariant(variants, new Variant(mt2, new Locale("fr"), "zip")));
assertTrue(verifyVariant(variants, new Variant(mt2, new Locale("fr"), "identity")));
}
+
+ @Test
+ public void testBuildAllWithoutAdd() {
+ VariantListBuilderImpl vb = new VariantListBuilderImpl();
+ MediaType mt1 = new MediaType("*", "*");
+ MediaType mt2 = new MediaType("text", "xml");
+ List<Variant> variants = vb.mediaTypes(mt1, mt2)
+ .languages(new Locale("en"), new Locale("fr")).encodings("zip", "identity").build();
+ assertEquals("8 variants need to be created", 8, variants.size());
+ assertTrue(verifyVariant(variants, new Variant(mt1, new Locale("en"), "zip")));
+ assertTrue(verifyVariant(variants, new Variant(mt1, new Locale("en"), "identity")));
+ assertTrue(verifyVariant(variants, new Variant(mt1, new Locale("fr"), "zip")));
+ assertTrue(verifyVariant(variants, new Variant(mt1, new Locale("fr"), "identity")));
+ assertTrue(verifyVariant(variants, new Variant(mt2, new Locale("en"), "zip")));
+ assertTrue(verifyVariant(variants, new Variant(mt2, new Locale("en"), "identity")));
+ assertTrue(verifyVariant(variants, new Variant(mt2, new Locale("fr"), "zip")));
+ assertTrue(verifyVariant(variants, new Variant(mt2, new Locale("fr"), "identity")));
+ }
@Test
public void testBuildTypeAndEnc() {
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4be70446
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4be70446
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4be70446
Branch: refs/heads/master
Commit: 4be7044693681d6263658821ff620ba1cd8ec62b
Parents: 85e7521 e0bbfe4
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Jul 11 17:38:20 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Jul 11 17:38:20 2017 +0100
----------------------------------------------------------------------
.../sts/rest/RESTSecurityTokenServiceImpl.java | 1 +
.../provider/jwt/DefaultJWTClaimsProvider.java | 23 +++++-
.../cxf/sts/token/provider/JWTClaimsTest.java | 75 ++++++++++++++++++++
.../cxf/systest/sts/rest/STSRESTTest.java | 7 +-
.../cxf/systest/sts/rest/cxf-rest-sts.xml | 7 ++
5 files changed, 108 insertions(+), 5 deletions(-)
----------------------------------------------------------------------