merge with 2.0.0-m3

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchDto.java

@@ -1,5 +1,6 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -12,8 +13,7 @@ public class BranchDto extends HalRepresentation {
   private String name;
   private String revision;
 
-  @Override
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
+  BranchDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapper.java

@@ -1,11 +1,11 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.NamespaceAndName;
 
@@ -15,7 +15,7 @@ import static de.otto.edison.hal.Link.linkBuilder;
 import static de.otto.edison.hal.Links.linkingTo;
 
 @Mapper
-public abstract class BranchToBranchDtoMapper extends LinkAppenderMapper {
+public abstract class BranchToBranchDtoMapper extends HalAppenderMapper {
 
   @Inject
   private ResourceLinks resourceLinks;
@@ -23,16 +23,17 @@ public abstract class BranchToBranchDtoMapper extends LinkAppenderMapper {
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   public abstract BranchDto map(Branch branch, @Context NamespaceAndName namespaceAndName);
 
-  @AfterMapping
-  void appendLinks(Branch source, @MappingTarget BranchDto target, @Context NamespaceAndName namespaceAndName) {
+  @ObjectFactory
+  BranchDto createDto(@Context NamespaceAndName namespaceAndName, Branch branch) {
     Links.Builder linksBuilder = linkingTo()
-      .self(resourceLinks.branch().self(namespaceAndName, target.getName()))
-      .single(linkBuilder("history", resourceLinks.branch().history(namespaceAndName, target.getName())).build())
-      .single(linkBuilder("changeset", resourceLinks.changeset().changeset(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision())).build())
-      .single(linkBuilder("source", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision())).build());
+      .self(resourceLinks.branch().self(namespaceAndName, branch.getName()))
+      .single(linkBuilder("history", resourceLinks.branch().history(namespaceAndName, branch.getName())).build())
+      .single(linkBuilder("changeset", resourceLinks.changeset().changeset(namespaceAndName.getNamespace(), namespaceAndName.getName(), branch.getRevision())).build())
+      .single(linkBuilder("source", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), branch.getRevision())).build());
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), source, namespaceAndName);
+    Embedded.Builder embeddedBuilder = Embedded.embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), branch, namespaceAndName);
 
-    target.add(linksBuilder.build());
+    return new BranchDto(linksBuilder.build(), embeddedBuilder.build());
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetDto.java

@@ -1,49 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import de.otto.edison.hal.HalRepresentation;
-import de.otto.edison.hal.Links;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.time.Instant;
-import java.util.List;
-
-@Getter
-@Setter
-@NoArgsConstructor
-public class ChangesetDto extends HalRepresentation {
-
-  /**
-   * The changeset identification string
-   */
-  private String id;
-
-  /**
-   * The author of the changeset
-   */
-  private PersonDto author;
-
-  /**
-   * The date when the changeset was committed
-   */
-  private Instant date;
-
-  /**
-   * The text of the changeset description
-   */
-  private String description;
-
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
-  }
-
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation withEmbedded(String rel, List<? extends HalRepresentation> halRepresentations) {
-    return super.withEmbedded(rel, halRepresentations);
-  }
-
-
-}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigDto.java

@@ -23,7 +23,9 @@ public class ConfigDto extends HalRepresentation {
   private boolean disableGroupingGrid;
   private String dateFormat;
   private boolean anonymousAccessEnabled;
+  @NoBlankStrings
   private Set<String> adminGroups;
+  @NoBlankStrings
   private Set<String> adminUsers;
   private String baseUrl;
   private boolean forceBaseUrl;

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigResource.java

@@ -9,6 +9,7 @@ import sonia.scm.util.ScmConfigurationUtil;
 import sonia.scm.web.VndMediaType;
 
 import javax.inject.Inject;
+import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
@@ -71,7 +72,7 @@ public class ConfigResource {
     @ResponseCode(code = 500, condition = "internal server error")
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
-  public Response update(ConfigDto configDto) {
+  public Response update(@Valid ConfigDto configDto) {
 
     // This *could* be moved to ScmConfiguration or ScmConfigurationUtil classes.
     // But to where to check? load() or store()? Leave it for now, SCMv1 legacy that can be cleaned up later.

scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java

@@ -1,11 +1,11 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Repository;
@@ -19,11 +19,12 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 
 @Mapper
-public abstract class ChangesetToChangesetDtoMapper extends LinkAppenderMapper implements InstantAttributeMapper {
+public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMapper implements InstantAttributeMapper, ChangesetToChangesetDtoMapper{
 
   @Inject
   private RepositoryServiceFactory serviceFactory;
@@ -31,7 +32,6 @@ public abstract class ChangesetToChangesetDtoMapper extends LinkAppenderMapper i
   @Inject
   private ResourceLinks resourceLinks;
 
-
   @Inject
   private BranchCollectionToDtoMapper branchCollectionToDtoMapper;
 
@@ -46,31 +46,35 @@ public abstract class ChangesetToChangesetDtoMapper extends LinkAppenderMapper i
   public abstract ChangesetDto map(Changeset changeset, @Context Repository repository);
 
 
-  @AfterMapping
-  void appendLinks(Changeset source, @MappingTarget ChangesetDto target, @Context Repository repository) {
+  @ObjectFactory
+  ChangesetDto createDto(@Context Repository repository, Changeset source) {
     String namespace = repository.getNamespace();
     String name = repository.getName();
 
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+
     try (RepositoryService repositoryService = serviceFactory.create(repository)) {
       if (repositoryService.isSupported(Command.TAGS)) {
-        target.withEmbedded("tags", tagCollectionToDtoMapper.getTagDtoList(namespace, name,
+        embeddedBuilder.with("tags", tagCollectionToDtoMapper.getTagDtoList(namespace, name,
           getListOfObjects(source.getTags(), tagName -> new Tag(tagName, source.getId()))));
       }
       if (repositoryService.isSupported(Command.BRANCHES)) {
-        target.withEmbedded("branches", branchCollectionToDtoMapper.getBranchDtoList(namespace, name,
+        embeddedBuilder.with("branches", branchCollectionToDtoMapper.getBranchDtoList(namespace, name,
           getListOfObjects(source.getBranches(), branchName -> new Branch(branchName, source.getId()))));
       }
     }
-    target.withEmbedded("parents", getListOfObjects(source.getParents(), parent -> changesetToParentDtoMapper.map(new Changeset(parent, 0L, null), repository)));
+    embeddedBuilder.with("parents", getListOfObjects(source.getParents(), parent -> changesetToParentDtoMapper.map(new Changeset(parent, 0L, null), repository)));
 
     Links.Builder linksBuilder = linkingTo()
-      .self(resourceLinks.changeset().self(repository.getNamespace(), repository.getName(), target.getId()))
-      .single(link("diff", resourceLinks.diff().self(namespace, name, target.getId())))
-      .single(link("modifications", resourceLinks.modifications().self(namespace, name, target.getId())));
+      .self(resourceLinks.changeset().self(repository.getNamespace(), repository.getName(), source.getId()))
+      .single(link("diff", resourceLinks.diff().self(namespace, name, source.getId())))
+      .single(link("sources", resourceLinks.source().self(namespace, name, source.getId())))
+      .single(link("modifications", resourceLinks.modifications().self(namespace, name, source.getId())));
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), source, repository);
 
-    target.add(linksBuilder.build());
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), source, repository);
+
+    return new ChangesetDto(linksBuilder.build(), embeddedBuilder.build());
   }
 
   private <T> List<T> getListOfObjects(List<String> list, Function<String, T> mapFunction) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/EdisonHalAppender.java

@@ -1,27 +1,36 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
+import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Link;
 import de.otto.edison.hal.Links;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class EdisonLinkAppender implements LinkAppender {
+class EdisonHalAppender implements HalAppender {
 
-  private final Links.Builder builder;
+  private final Links.Builder linkBuilder;
+  private final Embedded.Builder embeddedBuilder;
 
-  EdisonLinkAppender(Links.Builder builder) {
-    this.builder = builder;
+  EdisonHalAppender(Links.Builder linkBuilder, Embedded.Builder embeddedBuilder) {
+    this.linkBuilder = linkBuilder;
+    this.embeddedBuilder = embeddedBuilder;
   }
 
   @Override
-  public void appendOne(String rel, String href) {
-    builder.single(Link.link(rel, href));
+  public void appendLink(String rel, String href) {
+    linkBuilder.single(Link.link(rel, href));
   }
 
   @Override
-  public LinkArrayBuilder arrayBuilder(String rel) {
-    return new EdisonLinkArrayBuilder(builder, rel);
+  public LinkArrayBuilder linkArrayBuilder(String rel) {
+    return new EdisonLinkArrayBuilder(linkBuilder, rel);
+  }
+
+  @Override
+  public void appendEmbedded(String rel, HalRepresentation embedded) {
+    embeddedBuilder.with(rel, embedded);
   }
 
   private static class EdisonLinkArrayBuilder implements LinkArrayBuilder {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectDto.java

@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -27,10 +28,8 @@ public class FileObjectDto extends HalRepresentation {
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
   private String revision;
 
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
+  public FileObjectDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 
   public void setChildren(List<FileObjectDto> children) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java

@@ -1,21 +1,22 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.SubRepository;
 
 import javax.inject.Inject;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 
 @Mapper
-public abstract class FileObjectToFileObjectDtoMapper extends LinkAppenderMapper implements InstantAttributeMapper {
+public abstract class FileObjectToFileObjectDtoMapper extends HalAppenderMapper implements InstantAttributeMapper {
 
   @Inject
   private ResourceLinks resourceLinks;
@@ -25,20 +26,21 @@ public abstract class FileObjectToFileObjectDtoMapper extends LinkAppenderMapper
 
   abstract SubRepositoryDto mapSubrepository(SubRepository subRepository);
 
-  @AfterMapping
-  void addLinks(FileObject fileObject, @MappingTarget FileObjectDto dto, @Context NamespaceAndName namespaceAndName, @Context String revision) {
+  @ObjectFactory
+  FileObjectDto createDto(@Context NamespaceAndName namespaceAndName, @Context String revision, FileObject fileObject) {
     String path = removeFirstSlash(fileObject.getPath());
     Links.Builder links = Links.linkingTo();
-    if (dto.isDirectory()) {
+    if (fileObject.isDirectory()) {
       links.self(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, path));
     } else {
       links.self(resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, path));
       links.single(link("history", resourceLinks.fileHistory().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, path)));
     }
 
-    appendLinks(new EdisonLinkAppender(links), fileObject, namespaceAndName, revision);
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(links, embeddedBuilder), fileObject, namespaceAndName, revision);
 
-    dto.add(links.build());
+    return new FileObjectDto(links.build(), embeddedBuilder.build());
   }
 
   private String removeFirstSlash(String source) {

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

@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -27,13 +28,7 @@ public class GroupDto extends HalRepresentation {
   private Map<String, String> properties;
   private List<String> members;
 
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
-  }
-
-  public HalRepresentation withMembers(List<MemberDto> members) {
-    return super.withEmbedded("members", members);
+  GroupDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java

@@ -1,9 +1,9 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.group.Group;
 import sonia.scm.group.GroupPermissions;
 import sonia.scm.security.PermissionPermissions;
@@ -12,6 +12,7 @@ import javax.inject.Inject;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 
@@ -23,28 +24,26 @@ public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto>
   @Inject
   private ResourceLinks resourceLinks;
 
-  @AfterMapping
-  void appendLinks(Group group, @MappingTarget GroupDto target) {
-    Links.Builder linksBuilder = linkingTo().self(resourceLinks.group().self(target.getName()));
+  @ObjectFactory
+  GroupDto createDto(Group group) {
+    Links.Builder linksBuilder = linkingTo().self(resourceLinks.group().self(group.getName()));
     if (GroupPermissions.delete(group).isPermitted()) {
-      linksBuilder.single(link("delete", resourceLinks.group().delete(target.getName())));
+      linksBuilder.single(link("delete", resourceLinks.group().delete(group.getName())));
     }
     if (GroupPermissions.modify(group).isPermitted()) {
-      linksBuilder.single(link("update", resourceLinks.group().update(target.getName())));
+      linksBuilder.single(link("update", resourceLinks.group().update(group.getName())));
     }
     if (PermissionPermissions.read().isPermitted()) {
-      linksBuilder.single(link("permissions", resourceLinks.groupPermissions().permissions(target.getName())));
+      linksBuilder.single(link("permissions", resourceLinks.groupPermissions().permissions(group.getName())));
     }
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), group);
-
-    target.add(linksBuilder.build());
-  }
-
-  @AfterMapping
-  void mapMembers(Group group, @MappingTarget GroupDto target) {
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
     List<MemberDto> memberDtos = group.getMembers().stream().map(this::createMember).collect(Collectors.toList());
-    target.withMembers(memberDtos);
+    embeddedBuilder.with("members", memberDtos);
+
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), group);
+
+    return new GroupDto(linksBuilder.build(), embeddedBuilder.build());
   }
 
   private MemberDto createMember(String name) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDto.java

@@ -1,5 +1,6 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -9,8 +10,8 @@ public class IndexDto extends HalRepresentation {
 
   private final String version;
 
-  IndexDto(String version, Links links) {
-    super(links);
+  IndexDto(Links links, Embedded embedded, String version) {
+    super(links, embedded);
     this.version = version;
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/IndexDtoGenerator.java

@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import com.google.common.collect.Lists;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Link;
 import de.otto.edison.hal.Links;
 import org.apache.shiro.SecurityUtils;
@@ -13,9 +14,10 @@ import sonia.scm.user.UserPermissions;
 import javax.inject.Inject;
 import java.util.List;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 
-public class IndexDtoGenerator extends LinkAppenderMapper {
+public class IndexDtoGenerator extends HalAppenderMapper {
 
   private final ResourceLinks resourceLinks;
   private final SCMContextProvider scmContextProvider;
@@ -61,8 +63,9 @@ public class IndexDtoGenerator extends LinkAppenderMapper {
       builder.single(link("login", resourceLinks.authentication().jsonLogin()));
     }
 
-    appendLinks(new EdisonLinkAppender(builder), new Index());
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(builder, embeddedBuilder), new Index());
 
-    return new IndexDto(scmContextProvider.getVersion(), builder.build());
+    return new IndexDto(builder.build(), embeddedBuilder.build(), scmContextProvider.getVersion());
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/LinkEnricherAutoRegistration.java

@@ -10,30 +10,30 @@ import javax.servlet.ServletContextListener;
 import java.util.Set;
 
 /**
- * Registers every {@link LinkEnricher} which is annotated with an {@link Enrich} annotation.
+ * Registers every {@link HalEnricher} which is annotated with an {@link Enrich} annotation.
  */
 @Extension
 public class LinkEnricherAutoRegistration implements ServletContextListener {
 
   private static final Logger LOG = LoggerFactory.getLogger(LinkEnricherAutoRegistration.class);
 
-  private final LinkEnricherRegistry registry;
-  private final Set<LinkEnricher> enrichers;
+  private final HalEnricherRegistry registry;
+  private final Set<HalEnricher> enrichers;
 
   @Inject
-  public LinkEnricherAutoRegistration(LinkEnricherRegistry registry, Set<LinkEnricher> enrichers) {
+  public LinkEnricherAutoRegistration(HalEnricherRegistry registry, Set<HalEnricher> enrichers) {
     this.registry = registry;
     this.enrichers = enrichers;
   }
 
   @Override
   public void contextInitialized(ServletContextEvent sce) {
-    for (LinkEnricher enricher : enrichers) {
+    for (HalEnricher enricher : enrichers) {
       Enrich annotation = enricher.getClass().getAnnotation(Enrich.class);
       if (annotation != null) {
         registry.register(annotation.value(), enricher);
       } else {
-        LOG.warn("found LinkEnricher extension {} without Enrich annotation", enricher.getClass());
+        LOG.warn("found HalEnricher extension {} without Enrich annotation", enricher.getClass());
       }
     }
   }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java

@@ -28,7 +28,7 @@ public class MapperModule extends AbstractModule {
     bind(RepositoryPermissionDtoToRepositoryPermissionMapper.class).to(Mappers.getMapper(RepositoryPermissionDtoToRepositoryPermissionMapper.class).getClass());
     bind(RepositoryPermissionToRepositoryPermissionDtoMapper.class).to(Mappers.getMapper(RepositoryPermissionToRepositoryPermissionDtoMapper.class).getClass());
 
-    bind(ChangesetToChangesetDtoMapper.class).to(Mappers.getMapper(ChangesetToChangesetDtoMapper.class).getClass());
+    bind(ChangesetToChangesetDtoMapper.class).to(Mappers.getMapper(DefaultChangesetToChangesetDtoMapper.class).getClass());
     bind(ChangesetToParentDtoMapper.class).to(Mappers.getMapper(ChangesetToParentDtoMapper.class).getClass());
 
     bind(TagToTagDtoMapper.class).to(Mappers.getMapper(TagToTagDtoMapper.class).getClass());

scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDto.java

@@ -1,5 +1,6 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -18,9 +19,7 @@ public class MeDto extends HalRepresentation {
   private String mail;
   private List<String> groups;
 
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
+  MeDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/MeDtoFactory.java

@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import com.google.common.collect.ImmutableList;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.PrincipalCollection;
@@ -13,10 +14,11 @@ import sonia.scm.user.UserPermissions;
 import javax.inject.Inject;
 import java.util.Collections;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 
-public class MeDtoFactory extends LinkAppenderMapper {
+public class MeDtoFactory extends HalAppenderMapper {
 
   private final ResourceLinks resourceLinks;
   private final UserManager userManager;
@@ -29,15 +31,11 @@ public class MeDtoFactory extends LinkAppenderMapper {
 
   public MeDto create() {
     PrincipalCollection principals = getPrincipalCollection();
-
-    MeDto dto = new MeDto();
-
     User user = principals.oneByType(User.class);
 
+    MeDto dto = createDto(user);
     mapUserProperties(user, dto);
     mapGroups(principals, dto);
-
-    appendLinks(user, dto);
     return dto;
   }
 
@@ -61,21 +59,22 @@ public class MeDtoFactory extends LinkAppenderMapper {
   }
 
 
-  private void appendLinks(User user, MeDto target) {
+  private MeDto createDto(User user) {
     Links.Builder linksBuilder = linkingTo().self(resourceLinks.me().self());
     if (UserPermissions.delete(user).isPermitted()) {
-      linksBuilder.single(link("delete", resourceLinks.me().delete(target.getName())));
+      linksBuilder.single(link("delete", resourceLinks.me().delete(user.getName())));
     }
     if (UserPermissions.modify(user).isPermitted()) {
-      linksBuilder.single(link("update", resourceLinks.me().update(target.getName())));
+      linksBuilder.single(link("update", resourceLinks.me().update(user.getName())));
     }
     if (userManager.isTypeDefault(user) && UserPermissions.changePassword(user).isPermitted()) {
       linksBuilder.single(link("password", resourceLinks.me().passwordChange()));
     }
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), new Me(), user);
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), new Me(), user);
 
-    target.add(linksBuilder.build());
+    return new MeDto(linksBuilder.build(), embeddedBuilder.build());
   }
 
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/NoBlankStrings.java

@@ -0,0 +1,26 @@
+package sonia.scm.api.v2.resources;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({FIELD, METHOD, PARAMETER, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+@Constraint(validatedBy = NoBlankStringsValidator.class)
+@Documented
+public @interface NoBlankStrings {
+
+  String message() default "collection must not contain empty strings";
+
+  Class<?>[] groups() default {};
+
+  Class<? extends Payload>[] payload() default {};
+}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/NoBlankStringsValidator.java

@@ -0,0 +1,23 @@
+package sonia.scm.api.v2.resources;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.Collection;
+
+public class NoBlankStringsValidator implements ConstraintValidator<NoBlankStrings, Collection> {
+
+  @Override
+  public void initialize(NoBlankStrings constraintAnnotation) {
+  }
+
+  @Override
+  public boolean isValid(Collection object, ConstraintValidatorContext constraintContext) {
+    if ( object == null || object.isEmpty()) {
+      return true;
+    }
+    return object.stream()
+      .map(x -> x.toString())
+      .map(s -> ((String) s).trim())
+      .noneMatch(s -> ((String) s).isEmpty());
+  }
+}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/PersonDto.java

@@ -1,22 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-public class PersonDto {
-
-  /**
-   * mail address of the person
-   */
-  private String mail;
-
-  /**
-   * name of the person
-   */
-  private String name;
-
-}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDto.java

@@ -1,9 +1,11 @@
 package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -13,7 +15,7 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 
-@Getter @Setter
+@Getter @Setter @NoArgsConstructor
 public class RepositoryDto extends HalRepresentation {
 
   @Email
@@ -31,9 +33,7 @@ public class RepositoryDto extends HalRepresentation {
   private String type;
   protected Map<String, String> properties;
 
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
+  RepositoryDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java

@@ -1,11 +1,11 @@
 package sonia.scm.api.v2.resources;
 
 import com.google.inject.Inject;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Link;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.Feature;
 import sonia.scm.repository.HealthCheckFailure;
 import sonia.scm.repository.Repository;
@@ -17,6 +17,7 @@ import sonia.scm.repository.api.ScmProtocol;
 
 import java.util.List;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 import static java.util.stream.Collectors.toList;
@@ -33,17 +34,17 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
 
   abstract HealthCheckFailureDto toDto(HealthCheckFailure failure);
 
-  @AfterMapping
-  void appendLinks(Repository repository, @MappingTarget RepositoryDto target) {
-    Links.Builder linksBuilder = linkingTo().self(resourceLinks.repository().self(target.getNamespace(), target.getName()));
+  @ObjectFactory
+  RepositoryDto createDto(Repository repository) {
+    Links.Builder linksBuilder = linkingTo().self(resourceLinks.repository().self(repository.getNamespace(), repository.getName()));
     if (RepositoryPermissions.delete(repository).isPermitted()) {
-      linksBuilder.single(link("delete", resourceLinks.repository().delete(target.getNamespace(), target.getName())));
+      linksBuilder.single(link("delete", resourceLinks.repository().delete(repository.getNamespace(), repository.getName())));
     }
     if (RepositoryPermissions.modify(repository).isPermitted()) {
-      linksBuilder.single(link("update", resourceLinks.repository().update(target.getNamespace(), target.getName())));
+      linksBuilder.single(link("update", resourceLinks.repository().update(repository.getNamespace(), repository.getName())));
     }
     if (RepositoryPermissions.permissionRead(repository).isPermitted()) {
-      linksBuilder.single(link("permissions", resourceLinks.repositoryPermission().all(target.getNamespace(), target.getName())));
+      linksBuilder.single(link("permissions", resourceLinks.repositoryPermission().all(repository.getNamespace(), repository.getName())));
     }
     try (RepositoryService repositoryService = serviceFactory.create(repository)) {
       if (RepositoryPermissions.pull(repository).isPermitted()) {
@@ -53,26 +54,27 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
         linksBuilder.array(protocolLinks);
       }
       if (repositoryService.isSupported(Command.TAGS)) {
-        linksBuilder.single(link("tags", resourceLinks.tag().all(target.getNamespace(), target.getName())));
+        linksBuilder.single(link("tags", resourceLinks.tag().all(repository.getNamespace(), repository.getName())));
       }
       if (repositoryService.isSupported(Command.BRANCHES)) {
-        linksBuilder.single(link("branches", resourceLinks.branchCollection().self(target.getNamespace(), target.getName())));
+        linksBuilder.single(link("branches", resourceLinks.branchCollection().self(repository.getNamespace(), repository.getName())));
       }
       if (repositoryService.isSupported(Feature.INCOMING_REVISION)) {
-        linksBuilder.single(link("incomingChangesets", resourceLinks.incoming().changesets(target.getNamespace(), target.getName())));
-        linksBuilder.single(link("incomingDiff", resourceLinks.incoming().diff(target.getNamespace(), target.getName())));
+        linksBuilder.single(link("incomingChangesets", resourceLinks.incoming().changesets(repository.getNamespace(), repository.getName())));
+        linksBuilder.single(link("incomingDiff", resourceLinks.incoming().diff(repository.getNamespace(), repository.getName())));
       }
       if (repositoryService.isSupported(Command.MERGE)) {
-        linksBuilder.single(link("merge", resourceLinks.merge().merge(target.getNamespace(), target.getName())));
-        linksBuilder.single(link("mergeDryRun", resourceLinks.merge().dryRun(target.getNamespace(), target.getName())));
+        linksBuilder.single(link("merge", resourceLinks.merge().merge(repository.getNamespace(), repository.getName())));
+        linksBuilder.single(link("mergeDryRun", resourceLinks.merge().dryRun(repository.getNamespace(), repository.getName())));
       }
     }
-    linksBuilder.single(link("changesets", resourceLinks.changeset().all(target.getNamespace(), target.getName())));
-    linksBuilder.single(link("sources", resourceLinks.source().selfWithoutRevision(target.getNamespace(), target.getName())));
+    linksBuilder.single(link("changesets", resourceLinks.changeset().all(repository.getNamespace(), repository.getName())));
+    linksBuilder.single(link("sources", resourceLinks.source().selfWithoutRevision(repository.getNamespace(), repository.getName())));
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), repository);
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), repository);
 
-    target.add(linksBuilder.build());
+    return new RepositoryDto(linksBuilder.build(), embeddedBuilder.build());
   }
 
   private Link createProtocolLink(ScmProtocol protocol) {

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagDto.java

@@ -1,5 +1,6 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -15,10 +16,8 @@ public class TagDto extends HalRepresentation {
 
   private String revision;
 
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
+  TagDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java

@@ -1,21 +1,22 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Tag;
 
 import javax.inject.Inject;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 
 @Mapper
-public abstract class TagToTagDtoMapper extends LinkAppenderMapper {
+public abstract class TagToTagDtoMapper extends HalAppenderMapper {
 
   @Inject
   private ResourceLinks resourceLinks;
@@ -23,15 +24,16 @@ public abstract class TagToTagDtoMapper extends LinkAppenderMapper {
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   public abstract TagDto map(Tag tag, @Context NamespaceAndName namespaceAndName);
 
-  @AfterMapping
-  void appendLinks(Tag tag, @MappingTarget TagDto target, @Context NamespaceAndName namespaceAndName) {
+  @ObjectFactory
+  TagDto createDto(@Context NamespaceAndName namespaceAndName, Tag tag) {
     Links.Builder linksBuilder = linkingTo()
-      .self(resourceLinks.tag().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getName()))
-      .single(link("sources", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision())))
-      .single(link("changeset", resourceLinks.changeset().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision())));
+      .self(resourceLinks.tag().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), tag.getName()))
+      .single(link("sources", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), tag.getRevision())))
+      .single(link("changeset", resourceLinks.changeset().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), tag.getRevision())));
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), tag, namespaceAndName);
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), tag, namespaceAndName);
 
-    target.add(linksBuilder.build());
+    return new TagDto(linksBuilder.build(), embeddedBuilder.build());
   }
 }

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

@@ -1,6 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Getter;
@@ -33,9 +34,7 @@ public class UserDto extends HalRepresentation {
   private String type;
   private Map<String, String> properties;
 
-  @Override
-  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
-  protected HalRepresentation add(Links links) {
-    return super.add(links);
+  UserDto(Links links, Embedded embedded) {
+    super(links, embedded);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserToUserDtoMapper.java

@@ -1,10 +1,10 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Embedded;
 import de.otto.edison.hal.Links;
-import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
+import org.mapstruct.ObjectFactory;
 import sonia.scm.security.PermissionPermissions;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
@@ -12,6 +12,7 @@ import sonia.scm.user.UserPermissions;
 
 import javax.inject.Inject;
 
+import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
 
@@ -31,25 +32,26 @@ public abstract class UserToUserDtoMapper extends BaseMapper<User, UserDto> {
   @Inject
   private ResourceLinks resourceLinks;
 
-  @AfterMapping
-  protected void appendLinks(User user, @MappingTarget UserDto target) {
-    Links.Builder linksBuilder = linkingTo().self(resourceLinks.user().self(target.getName()));
+  @ObjectFactory
+  UserDto createDto(User user) {
+    Links.Builder linksBuilder = linkingTo().self(resourceLinks.user().self(user.getName()));
     if (UserPermissions.delete(user).isPermitted()) {
-      linksBuilder.single(link("delete", resourceLinks.user().delete(target.getName())));
+      linksBuilder.single(link("delete", resourceLinks.user().delete(user.getName())));
     }
     if (UserPermissions.modify(user).isPermitted()) {
-      linksBuilder.single(link("update", resourceLinks.user().update(target.getName())));
+      linksBuilder.single(link("update", resourceLinks.user().update(user.getName())));
       if (userManager.isTypeDefault(user)) {
-        linksBuilder.single(link("password", resourceLinks.user().passwordChange(target.getName())));
+        linksBuilder.single(link("password", resourceLinks.user().passwordChange(user.getName())));
       }
     }
     if (PermissionPermissions.read().isPermitted()) {
-      linksBuilder.single(link("permissions", resourceLinks.userPermissions().permissions(target.getName())));
+      linksBuilder.single(link("permissions", resourceLinks.userPermissions().permissions(user.getName())));
     }
 
-    appendLinks(new EdisonLinkAppender(linksBuilder), user);
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(new EdisonHalAppender(linksBuilder, embeddedBuilder), user);
 
-    target.add(linksBuilder.build());
+    return new UserDto(linksBuilder.build(), embeddedBuilder.build());
   }
 
 }