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

Merge

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-27 09:48:40 +02:00
parent fc576d5f2d 063772c1d5
commit e41c0323f3
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
View File

@@ -1,6 +1,7 @@
package sonia.scm.api.v2.resources; package sonia.scm.api.v2.resources;
import de.otto.edison.hal.HalRepresentation; import de.otto.edison.hal.HalRepresentation;
import org.mapstruct.Mapping;
import sonia.scm.ModelObject; import sonia.scm.ModelObject;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
@@ -9,6 +10,8 @@ import java.util.Optional;
abstract class BaseMapper<T extends ModelObject, D extends HalRepresentation> { abstract class BaseMapper<T extends ModelObject, D extends HalRepresentation> {
@Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
public abstract D map(T user); public abstract D map(T user);
Instant mapTime(Long epochMilli) { Instant mapTime(Long epochMilli) {

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.HalRepresentation;
import de.otto.edison.hal.Links; import de.otto.edison.hal.Links;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.time.Instant; import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
@Data @NoArgsConstructor @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true)
public class GroupDto extends HalRepresentation { public class GroupDto extends HalRepresentation {
private Instant creationDate; private Instant creationDate;
@@ -19,6 +21,8 @@ public class GroupDto extends HalRepresentation {
private Optional<Instant> lastModified; private Optional<Instant> lastModified;
private String name; private String name;
private String type; private String type;
private Map<String, String> properties;
private List<String> members;
@Override @Override
protected HalRepresentation add(Links links) { 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 lombok.NoArgsConstructor;
import java.time.Instant; import java.time.Instant;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
@AllArgsConstructor @NoArgsConstructor @AllArgsConstructor @NoArgsConstructor
@@ -24,6 +25,7 @@ public class UserDto extends HalRepresentation {
private String name; private String name;
private String password; private String password;
private String type; private String type;
private Map<String, String> properties;
@Override @Override
@SuppressWarnings("squid:S1185") // We want to have this method available in this package @SuppressWarnings("squid:S1185") // We want to have this method available in this package