diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java index a4eb8e29a7..7163497487 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java @@ -3,7 +3,6 @@ package sonia.scm.api.v2.resources; import de.otto.edison.hal.Links; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.repository.GitConfig; @@ -16,14 +15,11 @@ import static de.otto.edison.hal.Links.linkingTo; // Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection. @SuppressWarnings("squid:S3306") @Mapper -public abstract class GitConfigToGitConfigDtoMapper { +public abstract class GitConfigToGitConfigDtoMapper extends BaseMapper { @Inject private UriInfoStore uriInfoStore; - @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes - public abstract GitConfigDto map(GitConfig config); - @AfterMapping void appendLinks(GitConfig config, @MappingTarget GitConfigDto target) { Links.Builder linksBuilder = linkingTo().self(self()); diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java index 464f32a5a4..98137aebd5 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigToHgConfigDtoMapper.java @@ -3,7 +3,6 @@ package sonia.scm.api.v2.resources; import de.otto.edison.hal.Links; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.repository.HgConfig; @@ -16,14 +15,11 @@ import static de.otto.edison.hal.Links.linkingTo; // Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection. @SuppressWarnings("squid:S3306") @Mapper -public abstract class HgConfigToHgConfigDtoMapper { +public abstract class HgConfigToHgConfigDtoMapper extends BaseMapper { @Inject private UriInfoStore uriInfoStore; - @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes - public abstract HgConfigDto map(HgConfig config); - @AfterMapping void appendLinks(HgConfig config, @MappingTarget HgConfigDto target) { Links.Builder linksBuilder = linkingTo().self(self()); diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java index df974c3f3d..a71d75151d 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/api/v2/resources/SvnConfigToSvnConfigDtoMapper.java @@ -3,7 +3,6 @@ package sonia.scm.api.v2.resources; import de.otto.edison.hal.Links; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.repository.SvnConfig; @@ -16,14 +15,11 @@ import static de.otto.edison.hal.Links.linkingTo; // Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection. @SuppressWarnings("squid:S3306") @Mapper -public abstract class SvnConfigToSvnConfigDtoMapper { +public abstract class SvnConfigToSvnConfigDtoMapper extends BaseMapper { @Inject private UriInfoStore uriInfoStore; - @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes - public abstract SvnConfigDto map(SvnConfig config); - @AfterMapping void appendLinks(SvnConfig config, @MappingTarget SvnConfigDto target) { Links.Builder linksBuilder = linkingTo().self(self()); diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmConfigurationToConfigDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmConfigurationToConfigDtoMapper.java index ee0d32b0f8..ac9dba4e41 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmConfigurationToConfigDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmConfigurationToConfigDtoMapper.java @@ -3,7 +3,6 @@ package sonia.scm.api.v2.resources; import de.otto.edison.hal.Links; import org.mapstruct.AfterMapping; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import sonia.scm.config.ConfigurationPermissions; import sonia.scm.config.ScmConfiguration; @@ -16,14 +15,11 @@ import static de.otto.edison.hal.Links.linkingTo; // Mapstruct does not support parameterized (i.e. non-default) constructors. Thus, we need to use field injection. @SuppressWarnings("squid:S3306") @Mapper -public abstract class ScmConfigurationToConfigDtoMapper { +public abstract class ScmConfigurationToConfigDtoMapper extends BaseMapper { @Inject private ResourceLinks resourceLinks; - @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes - public abstract ConfigDto map(ScmConfiguration config); - @AfterMapping void appendLinks(ScmConfiguration config, @MappingTarget ConfigDto target) { Links.Builder linksBuilder = linkingTo().self(resourceLinks.config().self());