Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

Fix concurrent modification check for missing modification date

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-30 10:34:43 +02:00
parent f5600f60fb
commit b992ab414f
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
View File

@@ -71,8 +71,8 @@ class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
} }
private boolean modelObjectWasModifiedConcurrently(MODEL_OBJECT existing, MODEL_OBJECT updated) { private boolean modelObjectWasModifiedConcurrently(MODEL_OBJECT existing, MODEL_OBJECT updated) {
return (existing.getLastModified() != null && updated.getLastModified() != null) return existing.getLastModified() != null
&& (existing.getLastModified() > updated.getLastModified()); && (updated.getLastModified() == null || existing.getLastModified() > updated.getLastModified());
} }
public Response delete(Supplier<Optional<MODEL_OBJECT>> reader) { public Response delete(Supplier<Optional<MODEL_OBJECT>> reader) {

23
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupRootResourceTest.java
View File

@@ -122,10 +122,10 @@ public class GroupRootResourceTest {
MockHttpResponse response = new MockHttpResponse(); MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response); dispatcher.invoke(request, response);
Group capturedGroup = groupCaptor.getValue();
assertEquals(HttpServletResponse.SC_NO_CONTENT, response.getStatus()); assertEquals(HttpServletResponse.SC_NO_CONTENT, response.getStatus());
Group capturedGroup = groupCaptor.getValue();
assertEquals("Updated description", capturedGroup.getDescription()); assertEquals("Updated description", capturedGroup.getDescription());
} }
@@ -147,7 +147,7 @@ public class GroupRootResourceTest {
} }
@Test @Test
public void updateShouldFailOnConcurrentModification() throws URISyntaxException, IOException { public void updateShouldFailOnConcurrentModification_oldModificationDate() throws URISyntaxException, IOException {
URL url = Resources.getResource("sonia/scm/api/v2/group-test-update-concurrent-modification.json"); URL url = Resources.getResource("sonia/scm/api/v2/group-test-update-concurrent-modification.json");
byte[] groupJson = Resources.toByteArray(url); byte[] groupJson = Resources.toByteArray(url);
@@ -163,6 +163,23 @@ public class GroupRootResourceTest {
assertEquals(HttpServletResponse.SC_CONFLICT, response.getStatus()); assertEquals(HttpServletResponse.SC_CONFLICT, response.getStatus());
} }
@Test
public void updateShouldFailOnConcurrentModification_unsetModificationDate() throws URISyntaxException, IOException {
URL url = Resources.getResource("sonia/scm/api/v2/group-test-update-concurrent-modification_null_date.json");
byte[] groupJson = Resources.toByteArray(url);
MockHttpRequest request = MockHttpRequest
.put("/" + GroupRootResource.GROUPS_PATH_V2 + "admin")
.contentType(VndMediaType.GROUP)
.content(groupJson);
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
assertEquals(HttpServletResponse.SC_CONFLICT, response.getStatus());
}
@Test @Test
public void shouldDeleteGroup() throws URISyntaxException { public void shouldDeleteGroup() throws URISyntaxException {
Group group = createDummyGroup(); Group group = createDummyGroup();
@@ -236,7 +253,7 @@ public class GroupRootResourceTest {
group.setName("admin"); group.setName("admin");
group.setCreationDate(0L); group.setCreationDate(0L);
group.setMembers(Collections.singletonList("user")); group.setMembers(Collections.singletonList("user"));
group.setLastModified(1234L); group.setLastModified(3600000L);
return group; return group;
} }
} }

12
scm-webapp/src/test/resources/sonia/scm/api/v2/group-test-update-concurrent-modification_null_date.json Normal file
View File

@@ -0,0 +1,12 @@
{
"description": "Updated description",
"name": "admin",
"type": "xml",
"_embedded": {
"members": [
{
"name": "user"
}
]
}
}

3
scm-webapp/src/test/resources/sonia/scm/api/v2/group-test-update.json
View File

@@ -8,5 +8,6 @@
"name": "user" "name": "user"
} }
] ]
} },
"lastModified": "1970-01-01T01:00:00.00Z"
} }