cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [1/2] cxf git commit: Fixing 3.1.x build failure
Date Tue, 24 May 2016 16:28:17 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8f0f05a7d -> 4de35dea1


Fixing 3.1.x build failure


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/35fd5866
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/35fd5866
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/35fd5866

Branch: refs/heads/3.1.x-fixes
Commit: 35fd58669e740af4e7a83fc6ff544321c0fc8e38
Parents: 4c64e8b
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Tue May 24 17:26:46 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Tue May 24 17:26:46 2016 +0100

----------------------------------------------------------------------
 .../security/jose/jwejws/JAXRSJwsJsonTest.java  | 21 +++++++-------------
 1 file changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/35fd5866/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
index 9ee411b..cb632d0 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java
@@ -82,8 +82,8 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase {
     public void testJwsJsonPlainTextHmacUnencoded() throws Exception {
         String address = "https://localhost:" + PORT + "/jwsjsonhmac";
         BookStore bs = createBookStore(address, 
-                                       Collections.singletonMap(JoseConstants.RSSEC_SIGNATURE_PROPS,

-                                           "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"),
+            Collections.<String, Object>singletonMap(JoseConstants.RSSEC_SIGNATURE_PROPS,
+                "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"),
                                        null,
                                        false);
         String text = bs.echoText("book");
@@ -177,20 +177,13 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase
{
         }
     }
     
-    private BookStore createBookStore(String address, Object properties,
+    private BookStore createBookStore(String address, Object props,
                                       List<?> extraProviders) throws Exception {
         return createBookStore(address, 
-                               Collections.singletonMap(JoseConstants.RSSEC_SIGNATURE_PROPS,
properties),
-                               extraProviders,
-                               true);
-    }
-    private BookStore createBookStore(String address, 
-                                      Map<String, Object> mapProperties,
-                                      List<?> extraProviders) throws Exception {
-        return createBookStore(address, 
-                               mapProperties,
-                               extraProviders,
-                               true);
+            props instanceof Map ? (Map<String, Object>)props : Collections.<String,
Object>singletonMap(
+                JoseConstants.RSSEC_SIGNATURE_PROPS, props),
+            extraProviders,
+            true);
     }
     private BookStore createBookStore(String address, 
                                       Map<String, Object> mapProperties,


Mime
View raw message