merge 2.0.0-m3

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

@@ -0,0 +1,55 @@
+package sonia.scm.api.v2.resources;
+
+import com.google.common.annotations.VisibleForTesting;
+import de.otto.edison.hal.Embedded;
+import de.otto.edison.hal.Links;
+import org.mapstruct.Context;
+import org.mapstruct.MapperConfig;
+import org.mapstruct.ObjectFactory;
+import sonia.scm.repository.BrowserResult;
+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;
+
+@MapperConfig
+abstract class BaseFileObjectDtoMapper extends HalAppenderMapper implements InstantAttributeMapper {
+
+  @Inject
+  private ResourceLinks resourceLinks;
+
+  @VisibleForTesting
+  void setResourceLinks(ResourceLinks resourceLinks) {
+    this.resourceLinks = resourceLinks;
+  }
+
+  abstract SubRepositoryDto mapSubrepository(SubRepository subRepository);
+
+  @ObjectFactory
+  FileObjectDto createDto(@Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult, FileObject fileObject) {
+    String path = removeFirstSlash(fileObject.getPath());
+    Links.Builder links = Links.linkingTo();
+    if (fileObject.isDirectory()) {
+      links.self(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), browserResult.getRevision(), path));
+    } else {
+      links.self(resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), browserResult.getRevision(), path));
+      links.single(link("history", resourceLinks.fileHistory().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), browserResult.getRevision(), path)));
+    }
+
+    Embedded.Builder embeddedBuilder = embeddedBuilder();
+    applyEnrichers(links, embeddedBuilder, namespaceAndName, browserResult, fileObject);
+
+    return new FileObjectDto(links.build(), embeddedBuilder.build());
+  }
+
+  abstract void applyEnrichers(Links.Builder links, Embedded.Builder embeddedBuilder, NamespaceAndName namespaceAndName, BrowserResult browserResult, FileObject fileObject);
+
+  private String removeFirstSlash(String source) {
+    return source.startsWith("/") ? source.substring(1) : source;
+  }
+
+}

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

@@ -1,22 +1,60 @@
 package sonia.scm.api.v2.resources;
 
+import com.google.common.annotations.VisibleForTesting;
+import de.otto.edison.hal.Embedded;
+import de.otto.edison.hal.Links;
+import org.mapstruct.Context;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Qualifier;
 import sonia.scm.repository.BrowserResult;
+import sonia.scm.repository.FileObject;
 import sonia.scm.repository.NamespaceAndName;
 
 import javax.inject.Inject;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-public class BrowserResultToFileObjectDtoMapper {
-
-  private final FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper;
+@Mapper
+public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
 
   @Inject
-  public BrowserResultToFileObjectDtoMapper(FileObjectToFileObjectDtoMapper fileObjectToFileObjectDtoMapper) {
-    this.fileObjectToFileObjectDtoMapper = fileObjectToFileObjectDtoMapper;
+  private FileObjectToFileObjectDtoMapper childrenMapper;
+
+  @VisibleForTesting
+  void setChildrenMapper(FileObjectToFileObjectDtoMapper childrenMapper) {
+    this.childrenMapper = childrenMapper;
   }
 
-  public FileObjectDto map(BrowserResult browserResult, NamespaceAndName namespaceAndName) {
-    FileObjectDto fileObjectDto = fileObjectToFileObjectDtoMapper.map(browserResult.getFile(), namespaceAndName, browserResult);
-    fileObjectDto.setRevision( browserResult.getRevision() );
+  FileObjectDto map(BrowserResult browserResult, @Context NamespaceAndName namespaceAndName) {
+    FileObjectDto fileObjectDto = fileObjectToDto(browserResult.getFile(), namespaceAndName, browserResult);
+    fileObjectDto.setRevision(browserResult.getRevision());
     return fileObjectDto;
   }
+
+  @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
+  @Mapping(target = "children", qualifiedBy = Children.class)
+  protected abstract FileObjectDto fileObjectToDto(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult);
+
+  @Children
+  protected FileObjectDto childrenToDto(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult) {
+    return childrenMapper.map(fileObject, namespaceAndName, browserResult);
+  }
+
+  @Override
+  void applyEnrichers(Links.Builder links, Embedded.Builder embeddedBuilder, NamespaceAndName namespaceAndName, BrowserResult browserResult, FileObject fileObject) {
+    EdisonHalAppender appender = new EdisonHalAppender(links, embeddedBuilder);
+    // we call enrichers, which are only responsible for top level browseresults
+    applyEnrichers(appender, browserResult, namespaceAndName);
+    // we call enrichers, which are responsible for all file object top level browse result and its children
+    applyEnrichers(appender, fileObject, namespaceAndName, browserResult, browserResult.getRevision());
+  }
+
+  @Qualifier
+  @Target(ElementType.METHOD)
+  @Retention(RetentionPolicy.CLASS)
+  @interface Children {
+  }
 }

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

@@ -5,46 +5,18 @@ import de.otto.edison.hal.Links;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.BrowserResult;
 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 HalAppenderMapper implements InstantAttributeMapper {
-
-  @Inject
-  private ResourceLinks resourceLinks;
+public abstract class FileObjectToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
 
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   protected abstract FileObjectDto map(FileObject fileObject, @Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult);
 
-  abstract SubRepositoryDto mapSubrepository(SubRepository subRepository);
-
-  @ObjectFactory
-  FileObjectDto createDto(@Context NamespaceAndName namespaceAndName, @Context BrowserResult browserResult, FileObject fileObject) {
-    String path = removeFirstSlash(fileObject.getPath());
-    Links.Builder links = Links.linkingTo();
-    if (fileObject.isDirectory()) {
-      links.self(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), browserResult.getRevision(), path));
-    } else {
-      links.self(resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), browserResult.getRevision(), path));
-      links.single(link("history", resourceLinks.fileHistory().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), browserResult.getRevision(), path)));
-    }
-
-    Embedded.Builder embeddedBuilder = embeddedBuilder();
+  @Override
+  void applyEnrichers(Links.Builder links, Embedded.Builder embeddedBuilder, NamespaceAndName namespaceAndName, BrowserResult browserResult, FileObject fileObject) {
     applyEnrichers(new EdisonHalAppender(links, embeddedBuilder), fileObject, namespaceAndName, browserResult, browserResult.getRevision());
-
-    return new FileObjectDto(links.build(), embeddedBuilder.build());
-  }
-
-  private String removeFirstSlash(String source) {
-    return source.startsWith("/") ? source.substring(1) : source;
   }
 }

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

@@ -38,6 +38,7 @@ public class MapperModule extends AbstractModule {
     bind(TagToTagDtoMapper.class).to(Mappers.getMapper(TagToTagDtoMapper.class).getClass());
 
     bind(FileObjectToFileObjectDtoMapper.class).to(Mappers.getMapper(FileObjectToFileObjectDtoMapper.class).getClass());
+    bind(BrowserResultToFileObjectDtoMapper.class).to(Mappers.getMapper(BrowserResultToFileObjectDtoMapper.class).getClass());
     bind(ModificationsToDtoMapper.class).to(Mappers.getMapper(ModificationsToDtoMapper.class).getClass());
 
     bind(ReducedObjectModelToDtoMapper.class).to(Mappers.getMapper(ReducedObjectModelToDtoMapper.class).getClass());

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

@@ -14,6 +14,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
+import java.net.URLDecoder;
 
 import static sonia.scm.ContextEntry.ContextBuilder.entity;
 import static sonia.scm.NotFoundException.notFound;
@@ -57,7 +58,7 @@ public class SourceRootResource {
       BrowseCommandBuilder browseCommand = repositoryService.getBrowseCommand();
       browseCommand.setPath(path);
       if (revision != null && !revision.isEmpty()) {
-        browseCommand.setRevision(revision);
+        browseCommand.setRevision(URLDecoder.decode(revision, "UTF-8"));
       }
       browseCommand.setDisableCache(true);
       BrowserResult browserResult = browseCommand.getBrowserResult();