Merge branch 'develop' into feature/template_plugin

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

@@ -29,13 +29,15 @@ import de.otto.edison.hal.Links;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.ObjectFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Contributor;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.Signature;
-import sonia.scm.repository.Tag;
+import sonia.scm.repository.Tags;
 import sonia.scm.repository.api.Command;
 import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
@@ -45,6 +47,7 @@ import sonia.scm.security.gpg.RawGpgKey;
 import sonia.scm.web.EdisonHalAppender;
 
 import javax.inject.Inject;
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -57,6 +60,8 @@ import static de.otto.edison.hal.Links.linkingTo;
 @Mapper
 public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMapper implements InstantAttributeMapper, ChangesetToChangesetDtoMapper {
 
+  private static Logger LOG = LoggerFactory.getLogger(DefaultChangesetToChangesetDtoMapper.class);
+
   @Inject
   private RepositoryServiceFactory serviceFactory;
 
@@ -115,8 +120,16 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa
 
     try (RepositoryService repositoryService = serviceFactory.create(repository)) {
       if (repositoryService.isSupported(Command.TAGS)) {
-        embeddedBuilder.with("tags", tagCollectionToDtoMapper.getTagDtoList(namespace, name,
-          getListOfObjects(source.getTags(), tagName -> new Tag(tagName, source.getId()))));
+        Tags tags = null;
+        try {
+          tags = repositoryService.getTagsCommand().getTags();
+        } catch (IOException e) {
+          LOG.error("Error while retrieving tags from repository", e);
+        }
+        if (tags != null) {
+          embeddedBuilder.with("tags", tagCollectionToDtoMapper.getTagDtoList(namespace, name,
+            getListOfObjects(source.getTags(), tags::getTagByName)));
+        }
       }
       if (repositoryService.isSupported(Command.BRANCHES)) {
         embeddedBuilder.with("branches", branchCollectionToDtoMapper.getBranchDtoList(namespace, name,

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

@@ -21,9 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 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;
@@ -31,6 +32,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.time.Instant;
+
 @Getter
 @Setter
 @NoArgsConstructor
@@ -40,6 +43,9 @@ public class TagDto extends HalRepresentation {
 
   private String revision;
 
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private Instant date;
+
   TagDto(Links links, Embedded embedded) {
     super(links, embedded);
   }

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

@@ -29,6 +29,7 @@ import de.otto.edison.hal.Links;
 import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.Named;
 import org.mapstruct.ObjectFactory;
 import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Tag;
@@ -36,6 +37,9 @@ import sonia.scm.web.EdisonHalAppender;
 
 import javax.inject.Inject;
 
+import java.time.Instant;
+import java.util.Optional;
+
 import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
@@ -46,6 +50,7 @@ public abstract class TagToTagDtoMapper extends HalAppenderMapper {
   @Inject
   private ResourceLinks resourceLinks;
 
+  @Mapping(target = "date", source = "date", qualifiedByName = "mapDate")
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   public abstract TagDto map(Tag tag, @Context NamespaceAndName namespaceAndName);
 
@@ -61,4 +66,9 @@ public abstract class TagToTagDtoMapper extends HalAppenderMapper {
 
     return new TagDto(linksBuilder.build(), embeddedBuilder.build());
   }
+
+  @Named("mapDate")
+  Instant map(Optional<Long> value) {
+    return value.map(Instant::ofEpochMilli).orElse(null);
+  }
 }