From 7107d14bce8624c28d3523ecd86fd651e3c28b37 Mon Sep 17 00:00:00 2001 From: Johannes Schnatterer Date: Thu, 2 Aug 2018 18:33:36 +0200 Subject: [PATCH] Makes BaseMapper and CollectionToDtoMapper available for plugins --- .../src/main/java/sonia/scm/api/v2/resources/BaseMapper.java | 4 ++-- .../sonia/scm/api/v2/resources/CollectionToDtoMapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java index a3f83d21ab..e4cf8ecb5d 100644 --- a/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java +++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java @@ -5,12 +5,12 @@ import org.mapstruct.Mapping; import java.time.Instant; -abstract class BaseMapper { +public abstract class BaseMapper { @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes public abstract D map(T modelObject); - Instant mapTime(Long epochMilli) { + protected Instant mapTime(Long epochMilli) { return epochMilli == null? null: Instant.ofEpochMilli(epochMilli); } } diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java index 4f8c6a6f3f..523629ce3b 100644 --- a/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java +++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import static de.otto.edison.hal.Embedded.embeddedBuilder; import static de.otto.edison.hal.Links.linkingTo; -abstract class CollectionToDtoMapper { +public abstract class CollectionToDtoMapper { private final String collectionName; private final BaseMapper mapper;