Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 20:15:52 +01:00
Code Issues Packages Projects Releases Activity

Git Plugin Config: Gets rid of maven warning.

Browse Source 
Mapstruct "attributes" not mapped -> Field of HAL base class should be
ignored.
This commit is contained in:
Johannes Schnatterer
2018-08-02 10:53:13 +02:00
parent 7fd944357d
commit 79f807e809
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigDto.java
View File

@@ -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);

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigResource.java
View File

@@ -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;

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/GitConfigToGitConfigDtoMapper.java
View File

@@ -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