From b6208240ab64d59dacce7db9d3c5ba8f5ad94346 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 2 Mar 2020 11:18:57 +0100 Subject: [PATCH 1/4] remove obsolete repository fields --- .../sonia/scm/api/v2/resources/RepositoryDto.java | 2 -- .../v2/resources/RepositoryRootResourceTest.java | 13 ------------- .../RepositoryToRepositoryDtoMapperTest.java | 10 ---------- 3 files changed, 25 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java index df0fb0bafc..b048c6a4f7 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java @@ -30,10 +30,8 @@ public class RepositoryDto extends HalRepresentation { private String namespace; @Pattern(regexp = ValidationUtil.REGEX_REPOSITORYNAME) private String name; - private boolean archived = false; @NotEmpty private String type; - protected Map properties; RepositoryDto(Links links, Embedded embedded) { super(links, embedded); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java index fc0de8fe5c..60d9e3496d 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java @@ -138,19 +138,6 @@ public class RepositoryRootResourceTest extends RepositoryTestBase { assertTrue(response.getContentAsString().contains("\"name\":\"repo\"")); } - @Test - public void shouldMapProperties() throws URISyntaxException, UnsupportedEncodingException { - Repository repository = mockRepository("space", "repo"); - repository.setProperty("testKey", "testValue"); - - MockHttpRequest request = MockHttpRequest.get("/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo"); - MockHttpResponse response = new MockHttpResponse(); - - dispatcher.invoke(request, response); - - assertTrue(response.getContentAsString().contains("\"testKey\":\"testValue\"")); - } - @Test public void shouldGetAll() throws URISyntaxException, UnsupportedEncodingException { PageResult singletonPageResult = createSingletonPageResult(mockRepository("space", "repo")); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java index 4b02508ae8..9c6f87a765 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java @@ -77,16 +77,6 @@ public class RepositoryToRepositoryDtoMapperTest { assertEquals("none@example.com", dto.getContact()); } - @Test - public void shouldMapPropertiesProperty() { - Repository repository = createTestRepository(); - repository.setProperty("testKey", "testValue"); - - RepositoryDto dto = mapper.map(repository); - - assertEquals("testValue", dto.getProperties().get("testKey")); - } - @Test @SubjectAware(username = "unpriv") public void shouldCreateLinksForUnprivilegedUser() { From 8618a27ec8f1eca9d93f59edb41ea6995a0dba9f Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 2 Mar 2020 11:26:15 +0100 Subject: [PATCH 2/4] remove obsolete properties from user and group --- .../src/main/java/sonia/scm/api/v2/resources/GroupDto.java | 1 - scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java | 1 - 2 files changed, 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java index 3566589b3c..d1e8b4e250 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java @@ -24,7 +24,6 @@ public class GroupDto extends HalRepresentation { @Pattern(regexp = ValidationUtil.REGEX_NAME) private String name; private String type; - private Map properties; private List members; private boolean external; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java index d8a9885398..f7fde67f06 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java @@ -30,7 +30,6 @@ public class UserDto extends HalRepresentation { @JsonInclude(JsonInclude.Include.NON_NULL) private String password; private String type; - private Map properties; UserDto(Links links, Embedded embedded) { super(links, embedded); From e3099c16a23c1cf852e4f770b5d9d568c9dc33b3 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 2 Mar 2020 11:32:01 +0100 Subject: [PATCH 3/4] update CHANGELOG.md --- CHANGELOG.md | 1 + .../main/java/sonia/scm/api/v2/resources/GroupDto.java | 5 +++-- .../java/sonia/scm/api/v2/resources/RepositoryDto.java | 9 +++++---- .../main/java/sonia/scm/api/v2/resources/UserDto.java | 5 ++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2387635e02..9b19dcb9a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - Enunciate rest documentation +- Obsolete fields in data transfer objects ## 2.0.0-rc4 - 2020-02-14 ### Added diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java index d1e8b4e250..d17ab83fef 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java @@ -12,9 +12,10 @@ import sonia.scm.util.ValidationUtil; import javax.validation.constraints.Pattern; import java.time.Instant; import java.util.List; -import java.util.Map; -@Getter @Setter @NoArgsConstructor +@Getter +@Setter +@NoArgsConstructor public class GroupDto extends HalRepresentation { private Instant creationDate; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java index b048c6a4f7..852d62fd5d 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java @@ -7,16 +7,17 @@ import de.otto.edison.hal.Links; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotEmpty; import sonia.scm.util.ValidationUtil; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; import java.time.Instant; import java.util.List; -import java.util.Map; -@Getter @Setter @NoArgsConstructor +@Getter +@Setter +@NoArgsConstructor public class RepositoryDto extends HalRepresentation { @Email diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java index f7fde67f06..798c4b2513 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java @@ -7,13 +7,12 @@ import de.otto.edison.hal.Links; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotEmpty; import sonia.scm.util.ValidationUtil; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; import java.time.Instant; -import java.util.Map; @NoArgsConstructor @Getter @Setter public class UserDto extends HalRepresentation { From 69eb9793a8513885421f27ae9a08551905078588 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 3 Mar 2020 15:40:02 +0000 Subject: [PATCH 4/4] Close branch bugfix/remove_obsolete_repository_fields