From 79f807e8092ada75504938ec8bb57f698ce031b6 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Thu, 2 Aug 2018 10:53:13 +0200
Subject: [PATCH] Git Plugin Config: Gets rid of maven warning.

Mapstruct "attributes" not mapped -> Field of HAL base class should be
ignored.
---
 .../src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java | 3 ++-
 .../java/sonia/scm/api/v2/resources/GitConfigResource.java     | 3 ++-
 .../scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java    | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
index ac1db11642..8ecea58a19 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
@@ -13,10 +13,11 @@ import java.io.File;
 @Setter
 public class GitConfigDto extends HalRepresentation {
 
-  private String gcExpression;
   private File repositoryDirectory;
   private boolean disabled = false;
 
+  private String gcExpression;
+
   @Override
   protected HalRepresentation add(Links links) {
     return super.add(links);
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigResource.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigResource.java
index ddd6bf3823..8b8be14397 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigResource.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigResource.java
@@ -30,7 +30,8 @@ public class GitConfigResource {
   private final GitRepositoryHandler repositoryHandler;
 
   @Inject
-  public GitConfigResource(GitConfigDtoToGitConfigMapper dtoToConfigMapper, GitConfigToGitConfigDtoMapper configToDtoMapper, GitRepositoryHandler repositoryHandler) {
+  public GitConfigResource(GitConfigDtoToGitConfigMapper dtoToConfigMapper, GitConfigToGitConfigDtoMapper configToDtoMapper,
+                           GitRepositoryHandler repositoryHandler) {
     this.dtoToConfigMapper = dtoToConfigMapper;
     this.configToDtoMapper = configToDtoMapper;
     this.repositoryHandler = repositoryHandler;
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 b929d6522b..a4eb8e29a7 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,6 +3,7 @@ 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;
@@ -20,6 +21,7 @@ public abstract class GitConfigToGitConfigDtoMapper {
   @Inject
   private UriInfoStore uriInfoStore;
 
+  @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   public abstract GitConfigDto map(GitConfig config);
 
   @AfterMapping