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

Added properties field to UserDto and GroupDto

Browse Source 
Previously, properties weren't mapped by mapstruct
This commit is contained in:
Philipp Czora
2018-06-26 17:24:56 +02:00
parent 4f52825875
commit df5012db56
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
View File

@@ -4,13 +4,15 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import de.otto.edison.hal.HalRepresentation;
import de.otto.edison.hal.Links;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@Data @NoArgsConstructor
@Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true)
public class GroupDto extends HalRepresentation {
private Instant creationDate;
@@ -19,6 +21,8 @@ public class GroupDto extends HalRepresentation {
private Optional<Instant> lastModified;
private String name;
private String type;
private Map<String, String> properties;
private List<String> members;
@Override
protected HalRepresentation add(Links links) {

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
View File

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.time.Instant;
import java.util.Map;
import java.util.Optional;
@AllArgsConstructor @NoArgsConstructor
@@ -24,6 +25,7 @@ public class UserDto extends HalRepresentation {
private String name;
private String password;
private String type;
private Map<String, String> properties;
@Override
@SuppressWarnings("squid:S1185") // We want to have this method available in this package