cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Fixing merge
Date Tue, 19 Jan 2016 17:04:16 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 70ddd1dab -> c9286efa3


Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: c9286efa3645e059f1397a52f6c84dbceeac6f8f
Parents: 70ddd1d
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Jan 19 17:04:08 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Jan 19 17:04:08 2016 +0000

----------------------------------------------------------------------
 .../jaxrs/security/oauth2/filters/OAuthDataProviderImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c9286efa/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuthDataProviderImpl.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuthDataProviderImpl.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuthDataProviderImpl.java
index 660d505..20f17a0 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/OAuthDataProviderImpl.java
@@ -57,12 +57,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider
{
             return Collections.emptyList();
         }
         
-        List<OAuthPermission> permissions = new ArrayList<>();
+        List<OAuthPermission> permissions = new ArrayList<OAuthPermission>();
         for (String requestedScope : requestedScopes) {
             if ("read_book".equals(requestedScope)) {
                 OAuthPermission permission = new OAuthPermission();
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
+                List<String> uris = new ArrayList<String>();
                 String partnerAddress = "/secured/bookstore/books/*";
                 uris.add(partnerAddress);
                 permission.setUris(uris);
@@ -71,7 +71,7 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider
{
             } else if ("create_book".equals(requestedScope)) {
                 OAuthPermission permission = new OAuthPermission();
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
+                List<String> uris = new ArrayList<String>();
                 String partnerAddress = "/secured/bookstore/books/*";
                 uris.add(partnerAddress);
                 permission.setUris(uris);
@@ -84,4 +84,4 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider
{
         
         return permissions;
     }
-}
\ No newline at end of file
+}


Mime
View raw message