diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GlobalConfigDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GlobalConfigDto.java index 928daf5c3a..4d41e7306d 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GlobalConfigDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GlobalConfigDto.java @@ -5,10 +5,7 @@ import de.otto.edison.hal.Links; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import sonia.scm.xml.XmlSetStringAdapter; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Set; @NoArgsConstructor @@ -26,28 +23,15 @@ public class GlobalConfigDto extends HalRepresentation { private boolean disableGroupingGrid; private String dateFormat; private boolean anonymousAccessEnabled; - @XmlElement(name = "admin-groups") - @XmlJavaTypeAdapter(XmlSetStringAdapter.class) private Set adminGroups; - @XmlElement(name = "admin-users") - @XmlJavaTypeAdapter(XmlSetStringAdapter.class) private Set adminUsers; - @XmlElement(name = "base-url") private String baseUrl; - @XmlElement(name = "force-base-url") private boolean forceBaseUrl; - @XmlElement(name = "login-attempt-limit") private int loginAttemptLimit; - @XmlElement(name = "proxy-excludes") - @XmlJavaTypeAdapter(XmlSetStringAdapter.class) private Set proxyExcludes; - @XmlElement(name = "skip-failed-authenticators") private boolean skipFailedAuthenticators; - @XmlElement(name = "plugin-url") private String pluginUrl; - @XmlElement(name = "login-attempt-limit-timeout") private long loginAttemptLimitTimeout; - @XmlElement(name = "xsrf-protection") private boolean enabledXsrfProtection; @Override diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GlobalConfigResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GlobalConfigResourceTest.java index d59be3b19a..da2c9775e8 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GlobalConfigResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GlobalConfigResourceTest.java @@ -102,7 +102,6 @@ public class GlobalConfigResourceTest { assertTrue(response.getContentAsString().contains("\"proxyPassword\":\"newPassword\"")); assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"/v2/config/global")); assertTrue("link not found", response.getContentAsString().contains("\"update\":{\"href\":\"/v2/config/global")); - } @Test