[#82411992] ID must be in the url and we only use PUTs for creation,

like the service broker API. Can't write more tests until update and get
is implemented.

common/src/main/java/org/cloudfoundry/identity/uaa/zone/IdentityZoneEndpoints.java

@@ -2,27 +2,28 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 
 import static org.springframework.http.HttpStatus.CONFLICT;
 import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.web.bind.annotation.RequestMethod.POST;
+import static org.springframework.web.bind.annotation.RequestMethod.*;
 
 @RestController
 @RequestMapping("/identity-zones")
 public class IdentityZoneEndpoints {
 
     private IdentityZoneProvisioning dao;
 
-    @RequestMapping(method = POST)
-    @ResponseStatus(CREATED)
-    public IdentityZone createIdentityZone(@RequestBody @Valid IdentityZone zone) {
-        return dao.create(zone);
+    @RequestMapping(value="{id}", method = PUT)
+    public ResponseEntity<Void> createOrUpdateIdentityZone(@RequestBody @Valid IdentityZone zone, @PathVariable String id) {
+        zone.setId(id);
+        dao.create(zone);
+        return new ResponseEntity<Void>(CREATED);
     }
 
     public void setIdentityZoneProvisioning(IdentityZoneProvisioning dao) {

common/src/main/java/org/cloudfoundry/identity/uaa/zone/JdbcIdentityZoneProvisioning.java

@@ -1,6 +1,5 @@
 package org.cloudfoundry.identity.uaa.zone;
 
-import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementSetter;
@@ -33,19 +32,18 @@ public JdbcIdentityZoneProvisioning(JdbcTemplate jdbcTemplate) {
 
     @Override
     public IdentityZone retrieve(String id) {
-            IdentityZone identityZone = jdbcTemplate.queryForObject(IDENTITY_ZONE_BY_ID_QUERY, mapper, id);
-            return identityZone;
+        IdentityZone identityZone = jdbcTemplate.queryForObject(IDENTITY_ZONE_BY_ID_QUERY, mapper, id);
+        return identityZone;
     }
 
     @Override
     public IdentityZone create(final IdentityZone identityZone) {
-        final String id = UUID.randomUUID().toString();
 
         try {
             jdbcTemplate.update(CREATE_IDENTITY_ZONE_SQL, new PreparedStatementSetter() {
                 @Override
                 public void setValues(PreparedStatement ps) throws SQLException {
-                    ps.setString(1, id);
+                    ps.setString(1, identityZone.getId());
                     ps.setInt(2, identityZone.getVersion());
                     ps.setTimestamp(3, new Timestamp(new Date().getTime()));
                     ps.setTimestamp(4, new Timestamp(new Date().getTime()));
@@ -58,7 +56,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
             throw new ZoneAlreadyExistsException(e.getMostSpecificCause().getMessage());
         }
 
-        return retrieve(id);
+        return retrieve(identityZone.getId());
     }
 
     private static final class IdentityZoneRowMapper implements RowMapper<IdentityZone> {

uaa/src/main/webapp/WEB-INF/spring-servlet.xml

@@ -133,10 +133,10 @@
         <property name="identityZoneProvisioning" ref="identityZoneProvisioning" />
     </bean>
 
-    <http pattern="/identity-zones" create-session="stateless" authentication-manager-ref="emptyAuthenticationManager"
+    <http pattern="/identity-zones/**" create-session="stateless" authentication-manager-ref="emptyAuthenticationManager"
           entry-point-ref="oauthAuthenticationEntryPoint" access-decision-manager-ref="userAccessDecisionManager"
           xmlns="http://www.springframework.org/schema/security">
-        <intercept-url pattern="/identity-zones" method="POST" />
+        <intercept-url pattern="/identity-zones/**" method="PUT" />
         <custom-filter ref="resourceAgnosticAuthenticationFilter" position="PRE_AUTH_FILTER" />
         <access-denied-handler ref="oauthAccessDeniedHandler" />
     </http>

uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/zones/IdentityZoneEndpointsMockMvcTests.java

@@ -18,7 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -46,26 +46,21 @@ public static void tearDown() throws Exception {
 
     @Test
     public void testCreateZone() throws Exception {
-        IdentityZone identityZone = getIdentityZone(UUID.randomUUID().toString());
+        IdentityZone identityZone = getIdentityZone("mysubdomain");
+        String id = UUID.randomUUID().toString();
 
-        MvcResult result = mockMvc.perform(post("/identity-zones")
-                                            .contentType(APPLICATION_JSON)
-                                            .accept(APPLICATION_JSON)
-                                            .content(new ObjectMapper().writeValueAsString(identityZone)))
+        mockMvc.perform(put("/identity-zones/" + id)
+                                    .contentType(APPLICATION_JSON)
+                                    .content(new ObjectMapper().writeValueAsString(identityZone)))
                                     .andExpect(status().isCreated())
-                                    .andExpect(content().contentTypeCompatibleWith(APPLICATION_JSON))
+                                    .andExpect(content().string(""))
                                     .andReturn();
 
-        IdentityZone createdIdentityZone = new ObjectMapper().readValue(result.getResponse().getContentAsString(), IdentityZone.class);
-        assertEquals(identityZone.getSubDomain(), createdIdentityZone.getSubDomain());
-        assertEquals(identityZone.getName(), createdIdentityZone.getName());
-        assertEquals(identityZone.getDescription(), createdIdentityZone.getDescription());
-        UUID.fromString(createdIdentityZone.getId());
     }
 
-    private IdentityZone getIdentityZone(String salt) {
+    private IdentityZone getIdentityZone(String subdomain) {
         IdentityZone identityZone = new IdentityZone();
-        identityZone.setSubDomain("subdomain-" + salt);
+        identityZone.setSubDomain(subdomain);
         identityZone.setName("The Twiglet Zone");
         identityZone.setDescription("Like the Twilight Zone but tastier.");
         return identityZone;
@@ -74,30 +69,35 @@ private IdentityZone getIdentityZone(String salt) {
     @Test
     public void testCreateInvalidZone() throws Exception {
         IdentityZone identityZone = new IdentityZone();
+        String id = UUID.randomUUID().toString();
 
-        mockMvc.perform(post("/identity-zones")
+        mockMvc.perform(put("/identity-zones/" + id)
             .contentType(APPLICATION_JSON)
-            .accept(APPLICATION_JSON)
             .content(new ObjectMapper().writeValueAsString(identityZone)))
-        .andExpect(status().isBadRequest());
+            .andExpect(status().isBadRequest());
     }
+
+    // update a zone with a subdomain that already exists
+    // update a zone in place  with different data (happy)
+    // update a zone with exactly the same data (happy)
 
     @Test
-    public void testCreateDuplicateZone() throws Exception {
+    public void testCreatesZonesWithDuplicateSubdomains() throws Exception {
         IdentityZone identityZone = new IdentityZone();
         identityZone.setSubDomain("other-subdomain");
         identityZone.setName("The Twiglet Zone 2");
 
-        mockMvc.perform(post("/identity-zones")
+        mockMvc.perform(put("/identity-zones/" + UUID.randomUUID().toString())
                         .contentType(APPLICATION_JSON)
                         .accept(APPLICATION_JSON)
                         .content(new ObjectMapper().writeValueAsString(identityZone)))
-                  .andExpect(status().isCreated());
+                        .andExpect(status().isCreated());
 
-        mockMvc.perform(post("/identity-zones")
+        mockMvc.perform(put("/identity-zones/" + UUID.randomUUID().toString())
                         .contentType(APPLICATION_JSON)
                         .accept(APPLICATION_JSON)
                         .content(new ObjectMapper().writeValueAsString(identityZone)))
-                  .andExpect(status().isConflict());
+                        .andExpect(status().isConflict());
     }
+
 }