Rename IdentityProviderProvisioning.retrieveAll to retrieveActive to …

…avoid confusion on what the method actually does
cloudfoundry · Mar 27, 2015 · 724cb0f · 724cb0f
1 parent dbdcafe
commit 724cb0f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/common/src/main/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrap.java b/common/src/main/java/org/cloudfoundry/identity/uaa/config/IdentityProviderBootstrap.java
@@ -115,7 +115,7 @@ public void afterPropertiesSet() throws Exception {
         String zoneId = IdentityZone.getUaa().getId();
 
         //deactivate all providers that are no longer present
-        for (IdentityProvider provider: provisioning.retrieveAll(zoneId)) {
+        for (IdentityProvider provider: provisioning.retrieveAll(false, zoneId)) {
             if (Origin.SAML.equals(provider.getType()) ||
                 Origin.LDAP.equals(provider.getType()) ||
                 Origin.KEYSTONE.equals(provider.getType())) {
@@ -132,6 +132,7 @@ public void afterPropertiesSet() throws Exception {
             }catch (EmptyResultDataAccessException x){
             }
             provider.setIdentityZoneId(zoneId);
+            provider.setActive(true);
             if (existing==null) {
                 provisioning.create(provider);
             } else {

diff --git a/common/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityProviderProvisioning.java b/common/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityProviderProvisioning.java
@@ -16,17 +16,17 @@
 
 public interface IdentityProviderProvisioning {
 
-    public IdentityProvider create(IdentityProvider identityProvider);
+    IdentityProvider create(IdentityProvider identityProvider);
 
-    public IdentityProvider update(IdentityProvider identityProvider);
+    IdentityProvider update(IdentityProvider identityProvider);
 
-    public IdentityProvider retrieve(String id);
+    IdentityProvider retrieve(String id);
 
-    public List<IdentityProvider> retrieveAll(String zoneId);
+    List<IdentityProvider> retrieveActive(String zoneId);
 
-    public List<IdentityProvider> retrieveAll(boolean activeOnly, String zoneId);
+    List<IdentityProvider> retrieveAll(boolean activeOnly, String zoneId);
 
-    public IdentityProvider retrieveByOrigin(String origin, String zoneId);
+    IdentityProvider retrieveByOrigin(String origin, String zoneId);
 
 
 }
diff --git a/...on/src/main/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityProviderProvisioning.java b/...on/src/main/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityProviderProvisioning.java
@@ -62,14 +62,14 @@ public IdentityProvider retrieve(String id) {
     }
 
     @Override
-    public List<IdentityProvider> retrieveAll(String zoneId) {
+    public List<IdentityProvider> retrieveActive(String zoneId) {
         return jdbcTemplate.query(IDENTITY_ACTIVE_PROVIDERS_QUERY, mapper, zoneId);
     }
 
     @Override
     public List<IdentityProvider> retrieveAll(boolean activeOnly, String zoneId) {
         if (activeOnly) {
-            return retrieveAll(zoneId);
+            return retrieveActive(zoneId);
         } else {
             return jdbcTemplate.query(IDENTITY_PROVIDERS_QUERY, mapper, zoneId);
         }

diff --git a/...c/test/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityProviderProvisioningTests.java b/...c/test/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityProviderProvisioningTests.java
@@ -182,21 +182,21 @@ public void testRetrieveIdentityProviderById() {
     @Test
     public void testRetrieveAll() throws Exception {
         String uaaZoneId = IdentityZone.getUaa().getId();
-        List<IdentityProvider> identityProviders = db.retrieveAll(uaaZoneId);
+        List<IdentityProvider> identityProviders = db.retrieveActive(uaaZoneId);
         int numberOfIdps =  identityProviders.size();
         String origin = RandomStringUtils.randomAlphabetic(6);
 
         IdentityProvider defaultZoneIdp = MultitenancyFixture.identityProvider(origin, uaaZoneId);
         db.create(defaultZoneIdp);
-        identityProviders = db.retrieveAll(uaaZoneId);
+        identityProviders = db.retrieveActive(uaaZoneId);
         assertEquals(numberOfIdps + 1, identityProviders.size());
 
         IdentityZone otherZone = MultitenancyFixture.identityZone(UUID.randomUUID().toString(), "myzone");
         String originKey = RandomStringUtils.randomAlphabetic(6);
         IdentityProvider otherZoneIdp = MultitenancyFixture.identityProvider(originKey, otherZone.getId());
         db.create(otherZoneIdp);
 
-        identityProviders = db.retrieveAll(otherZone.getId());
+        identityProviders = db.retrieveActive(otherZone.getId());
         assertEquals(1, identityProviders.size());
     }
 

diff --git a/.../java/org/cloudfoundry/identity/uaa/mock/zones/IdentityProviderEndpointsMockMvcTests.java b/.../java/org/cloudfoundry/identity/uaa/mock/zones/IdentityProviderEndpointsMockMvcTests.java
@@ -157,7 +157,7 @@ public void testEnsureWeRetrieveInactiveIDPsToo() throws Exception {
     }
 
     private void createAndUpdateIdentityProvider(String accessToken, String zoneId) throws Exception {
-        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("saml", IdentityZone.getUaa().getId());
+        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("testorigin", IdentityZone.getUaa().getId());
         // create
         // check response
         IdentityProvider createdIDP = createIdentityProvider(zoneId, identityProvider, accessToken, status().isCreated());
@@ -196,21 +196,21 @@ private void createAndUpdateIdentityProvider(String accessToken, String zoneId)
 
     @Test
     public void testCreateIdentityProviderWithInsufficientScopes() throws Exception {
-        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("saml", IdentityZone.getUaa().getId());
+        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("testorigin", IdentityZone.getUaa().getId());
         createIdentityProvider(null, identityProvider, adminToken, status().isForbidden());
         assertEquals(0, eventListener.getEventCount());
     }
 
     @Test
     public void testUpdateIdentityProviderWithInsufficientScopes() throws Exception {
-        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("saml", IdentityZone.getUaa().getId());
+        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("testorigin", IdentityZone.getUaa().getId());
         updateIdentityProvider(null, identityProvider, adminToken, status().isForbidden());
         assertEquals(0, eventListener.getEventCount());
     }
 
     @Test
     public void testCreateAndUpdateIdentityProviderInOtherZone() throws Exception {
-        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("saml", IdentityZone.getUaa().getId());
+        IdentityProvider identityProvider = MultitenancyFixture.identityProvider("testorigin", IdentityZone.getUaa().getId());
         IdentityZone zone = mockMvcUtils.createZoneUsingWebRequest(mockMvc,identityToken);
         ScimUser user = createAdminForZone("zones." + zone.getId() + ".admin");
 
@@ -237,7 +237,7 @@ public void testListIdpsInZone() throws Exception {
         ScimUser user = createAdminForZone("idps.read,idps.write");
         String accessToken = mockMvcUtils.getUserOAuthAccessToken(mockMvc, client.getClientId(), client.getClientSecret(), user.getUserName(), "password", "idps.read,idps.write");
 
-        int numberOfIdps = identityProviderProvisioning.retrieveAll(IdentityZone.getUaa().getId()).size();
+        int numberOfIdps = identityProviderProvisioning.retrieveAll(false,IdentityZone.getUaa().getId()).size();
 
         String originKey = RandomStringUtils.randomAlphabetic(6);
         IdentityProvider newIdp = MultitenancyFixture.identityProvider(originKey, IdentityZone.getUaa().getId());