[sling-org-apache-sling-tenant] 02/44: SLING-2656 Throw IllegalArgumentException instead of InvalidSyntaxException from the getTenants(String) method

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git

commit b0881e0f1caa7467801801f4b91e65e7191e33cc
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Mon Nov 12 06:38:13 2012 +0000

    SLING-2656 Throw IllegalArgumentException instead of InvalidSyntaxException from the getTenants(String) method
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1408176 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/tenant/TenantProvider.java          | 7 +++----
 .../java/org/apache/sling/tenant/internal/TenantProviderImpl.java  | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/tenant/TenantProvider.java b/src/main/java/org/apache/sling/tenant/TenantProvider.java
index 193804b..345b766 100644
--- a/src/main/java/org/apache/sling/tenant/TenantProvider.java
+++ b/src/main/java/org/apache/sling/tenant/TenantProvider.java
@@ -20,8 +20,6 @@ package org.apache.sling.tenant;
 
 import java.util.Iterator;
 
-import org.osgi.framework.InvalidSyntaxException;
-
 /**
  * The <code>TenantProvider</code> defines the service interface of for a sevice
  * which may be asked for {@link Tenant tenant instances}.
@@ -54,7 +52,8 @@ public interface TenantProvider {
      * <code>tenantFilter</code> is not a valid filter string the iterator is
      * empty.
      *
-     * @throws InvalidSyntaxException if filter syntax is invalid
+     * @throws IllegalArgumentException if filter syntax is invalid. A more
+     *      detailed exception may be wrapped by the exception.
      */
-    Iterator<Tenant> getTenants(String tenantFilter) throws InvalidSyntaxException;
+    Iterator<Tenant> getTenants(String tenantFilter);
 }
diff --git a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
index 92a6e34..8cc366c 100644
--- a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
+++ b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
@@ -188,7 +188,7 @@ public class TenantProviderImpl implements TenantProvider {
         throw new PersistenceException("Cannot create the tenant");
     }
 
-    public Iterator<Tenant> getTenants(String tenantFilter) throws InvalidSyntaxException {
+    public Iterator<Tenant> getTenants(String tenantFilter) {
         if (StringUtils.isBlank(tenantFilter)) {
             return null;
         }
@@ -211,6 +211,8 @@ public class TenantProviderImpl implements TenantProvider {
                     }
                 }
                 return tenantList.iterator();
+            } catch (InvalidSyntaxException e) {
+                throw new IllegalArgumentException(e.getMessage(), e);
             } finally {
                 adminResolver.close();
             }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.