From 59b60d104ca3e8f6014363239136bd933aefc610 Mon Sep 17 00:00:00 2001 From: Johannes Schnatterer Date: Wed, 1 Aug 2018 14:44:42 +0200 Subject: [PATCH] GitConfigDto: Use camel case, get rid of base class. There's no parent module for a shared SimpleRepositoryConfigDto for git, hg and svn. scm-plugins and core are too generic. The redundancy (one property) does not hurt too much right now. --- .../scm/api/v2/resources/GitConfigDto.java | 7 ++++--- .../v2/resources/SimpleRepositoryConfigDto.java | 17 ----------------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/SimpleRepositoryConfigDto.java 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 2bd2cf755c..ac1db11642 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 @@ -6,15 +6,16 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.xml.bind.annotation.XmlElement; +import java.io.File; @NoArgsConstructor @Getter @Setter -public class GitConfigDto extends SimpleRepositoryConfigDto { +public class GitConfigDto extends HalRepresentation { - @XmlElement(name = "gc-expression") private String gcExpression; + private File repositoryDirectory; + private boolean disabled = false; @Override protected HalRepresentation add(Links links) { diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/SimpleRepositoryConfigDto.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/SimpleRepositoryConfigDto.java deleted file mode 100644 index 45cb0bd199..0000000000 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/SimpleRepositoryConfigDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package sonia.scm.api.v2.resources; - -import de.otto.edison.hal.HalRepresentation; -import lombok.Getter; -import lombok.Setter; - -import javax.xml.bind.annotation.XmlElement; -import java.io.File; - -@Getter -@Setter -public abstract class SimpleRepositoryConfigDto extends HalRepresentation { - - private boolean disabled = false; - @XmlElement(name = "repository-directory") - private File repositoryDirectory; -}