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

Simplifies GlobalConfigDto.

Browse Source 
Use camel case everywhere and no XML annotation.
This commit is contained in:
Johannes Schnatterer
2018-07-31 14:13:41 +02:00
parent 9aaca22942
commit 912dea6d6e
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GlobalConfigDto.java
View File

@@ -5,10 +5,7 @@ import de.otto.edison.hal.Links;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; 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; import java.util.Set;
@NoArgsConstructor @NoArgsConstructor
@@ -26,28 +23,15 @@ public class GlobalConfigDto extends HalRepresentation {
private boolean disableGroupingGrid; private boolean disableGroupingGrid;
private String dateFormat; private String dateFormat;
private boolean anonymousAccessEnabled; private boolean anonymousAccessEnabled;
@XmlElement(name = "admin-groups")
@XmlJavaTypeAdapter(XmlSetStringAdapter.class)
private Set<String> adminGroups; private Set<String> adminGroups;
@XmlElement(name = "admin-users")
@XmlJavaTypeAdapter(XmlSetStringAdapter.class)
private Set<String> adminUsers; private Set<String> adminUsers;
@XmlElement(name = "base-url")
private String baseUrl; private String baseUrl;
@XmlElement(name = "force-base-url")
private boolean forceBaseUrl; private boolean forceBaseUrl;
@XmlElement(name = "login-attempt-limit")
private int loginAttemptLimit; private int loginAttemptLimit;
@XmlElement(name = "proxy-excludes")
@XmlJavaTypeAdapter(XmlSetStringAdapter.class)
private Set<String> proxyExcludes; private Set<String> proxyExcludes;
@XmlElement(name = "skip-failed-authenticators")
private boolean skipFailedAuthenticators; private boolean skipFailedAuthenticators;
@XmlElement(name = "plugin-url")
private String pluginUrl; private String pluginUrl;
@XmlElement(name = "login-attempt-limit-timeout")
private long loginAttemptLimitTimeout; private long loginAttemptLimitTimeout;
@XmlElement(name = "xsrf-protection")
private boolean enabledXsrfProtection; private boolean enabledXsrfProtection;
@Override @Override

1
scm-webapp/src/test/java/sonia/scm/api/v2/resources/GlobalConfigResourceTest.java
View File

@@ -102,7 +102,6 @@ public class GlobalConfigResourceTest {
assertTrue(response.getContentAsString().contains("\"proxyPassword\":\"newPassword\"")); assertTrue(response.getContentAsString().contains("\"proxyPassword\":\"newPassword\""));
assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"/v2/config/global")); assertTrue(response.getContentAsString().contains("\"self\":{\"href\":\"/v2/config/global"));
assertTrue("link not found", response.getContentAsString().contains("\"update\":{\"href\":\"/v2/config/global")); assertTrue("link not found", response.getContentAsString().contains("\"update\":{\"href\":\"/v2/config/global"));
} }
@Test @Test