Merge branch 'Issue-1149' into 1.3.x

Author: iancorcoran

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/provider/ExternalAccountStoreModelFactory.java

@@ -22,8 +22,10 @@
 import com.stormpath.sdk.application.ApplicationAccountStoreMappings;
 import com.stormpath.sdk.application.webconfig.ApplicationWebConfig;
 import com.stormpath.sdk.directory.AccountStore;
-import com.stormpath.sdk.directory.AccountStoreVisitorAdapter;
+import com.stormpath.sdk.directory.AccountStoreVisitor;
 import com.stormpath.sdk.directory.Directory;
+import com.stormpath.sdk.group.Group;
+import com.stormpath.sdk.organization.Organization;
 import com.stormpath.sdk.provider.GoogleProvider;
 import com.stormpath.sdk.provider.OAuthProvider;
 import com.stormpath.sdk.provider.Provider;
@@ -77,7 +79,7 @@ protected String getAuthorizeBaseUri(@SuppressWarnings("UnusedParameters") HttpS
         return authorizeBaseUri;
     }
 
-    private class AccountStoreModelVisitor extends AccountStoreVisitorAdapter {
+    private class AccountStoreModelVisitor implements AccountStoreVisitor {
 
         private final List<AccountStoreModel> accountStores;
         private final String authorizeBaseUri;
@@ -87,6 +89,11 @@ public AccountStoreModelVisitor(List<AccountStoreModel> accountStores, String au
             this.authorizeBaseUri = authorizeBaseUri;
         }
 
+        @Override
+        public void visit(Group group) {
+            //Do nothing... groups cannot be external
+        }
+
         //Only directories can support provider-based workflows:
         @Override
         public void visit(Directory directory) {
@@ -110,6 +117,11 @@ public void visit(Directory directory) {
             }
         }
 
+        @Override
+        public void visit(Organization organization) {
+            //Do nothing... organizations cannot be external
+        }
+
         public List<AccountStoreModel> getAccountStores() {
             return accountStores;
         }