rename defaultNamespaceStrategy to namespaceStrategy

2025-11-07 22:15:45 +01:00 · 2019-03-12 15:54:34 +01:00
parent f7f5102541
commit cb554eb7bc
14 changed files with 36 additions and 39 deletions
--- a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
+++ b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
@@ -184,8 +184,8 @@ public class ScmConfiguration implements Configuration {
  @XmlElement(name = "xsrf-protection")
  private boolean enabledXsrfProtection = true;

-  @XmlElement(name = "default-namespace-strategy")
-  private String defaultNamespaceStrategy = "UsernameNamespaceStrategy";
+  @XmlElement(name = "namespace-strategy")
+  private String namespaceStrategy = "UsernameNamespaceStrategy";


  /**
@@ -227,7 +227,7 @@ public class ScmConfiguration implements Configuration {
    this.loginAttemptLimit = other.loginAttemptLimit;
    this.loginAttemptLimitTimeout = other.loginAttemptLimitTimeout;
    this.enabledXsrfProtection = other.enabledXsrfProtection;
-    this.defaultNamespaceStrategy = other.defaultNamespaceStrategy;
+    this.namespaceStrategy = other.namespaceStrategy;
  }

  public Set<String> getAdminGroups() {
@@ -366,8 +366,8 @@ public class ScmConfiguration implements Configuration {
    return loginAttemptLimit > 0;
  }

-  public String getDefaultNamespaceStrategy() {
-    return defaultNamespaceStrategy;
+  public String getNamespaceStrategy() {
+    return namespaceStrategy;
  }


@@ -501,8 +501,8 @@ public class ScmConfiguration implements Configuration {
    this.enabledXsrfProtection = enabledXsrfProtection;
  }

-  public void setDefaultNamespaceStrategy(String defaultNamespaceStrategy) {
-    this.defaultNamespaceStrategy = defaultNamespaceStrategy;
+  public void setNamespaceStrategy(String namespaceStrategy) {
+    this.namespaceStrategy = namespaceStrategy;
  }

  @Override
--- a/scm-ui-components/packages/ui-types/src/Config.js
+++ b/scm-ui-components/packages/ui-types/src/Config.js
@@ -22,6 +22,6 @@ export type Config = {
  pluginUrl: string,
  loginAttemptLimitTimeout: number,
  enabledXsrfProtection: boolean,
-  defaultNamespaceStrategy: string,
+  namespaceStrategy: string,
  _links: Links
 };
--- a/scm-ui/public/locales/de/config.json
+++ b/scm-ui/public/locales/de/config.json
@@ -57,7 +57,7 @@
    "skip-failed-authenticators": "Fehlgeschlagene Authentifizierer überspringen",
    "plugin-url": "Plugin URL",
    "enabled-xsrf-protection": "XSRF Protection aktivieren",
-    "default-namespace-strategy": "Default Namespace Strategie"
+    "namespace-strategy": "Namespace Strategie"
  },
  "validation": {
    "date-format-invalid": "Das Datumsformat ist ungültig",
@@ -87,6 +87,6 @@
    "proxyUserHelpText": "Der Benutzername für die Proxy Server Anmeldung.",
    "proxyExcludesHelpText": "Glob patterns für Hostnamen, die von den Proxy-Einstellungen ausgeschlossen werden sollen.",
    "enableXsrfProtectionHelpText": "Xsrf Cookie Protection aktivieren. Hinweis: Dieses Feature befindet sich noch im Experimentalstatus.",
-    "defaultNameSpaceStrategyHelpText": "Die Standardstrategie für Namespaces."
+    "nameSpaceStrategyHelpText": "Strategie für Namespaces."
  }
 }
--- a/scm-ui/public/locales/en/config.json
+++ b/scm-ui/public/locales/en/config.json
@@ -57,7 +57,7 @@
    "skip-failed-authenticators": "Skip Failed Authenticators",
    "plugin-url": "Plugin URL",
    "enabled-xsrf-protection": "Enabled XSRF Protection",
-    "default-namespace-strategy": "Default Namespace Strategy"
+    "namespace-strategy": "Namespace Strategy"
  },
  "validation": {
    "date-format-invalid": "The date format is not valid",
@@ -87,6 +87,6 @@
    "proxyUserHelpText": "The username for the proxy server authentication.",
    "proxyExcludesHelpText": "Glob patterns for hostnames, which should be excluded from proxy settings.",
    "enableXsrfProtectionHelpText": "Enable XSRF Cookie Protection. Note: This feature is still experimental.",
-    "defaultNameSpaceStrategyHelpText": "The default namespace strategy."
+    "nameSpaceStrategyHelpText": "The namespace strategy."
  }
 }
--- a/scm-ui/src/config/components/form/ConfigForm.js
+++ b/scm-ui/src/config/components/form/ConfigForm.js
@@ -2,8 +2,7 @@
 import React from "react";
 import { translate } from "react-i18next";
 import { SubmitButton, Notification } from "@scm-manager/ui-components";
-import type { NamespaceStrategies } from "@scm-manager/ui-types";
-import type { Config } from "@scm-manager/ui-types";
+import type { NamespaceStrategies, Config } from "@scm-manager/ui-types";
 import ProxySettings from "./ProxySettings";
 import GeneralSettings from "./GeneralSettings";
 import BaseUrlSettings from "./BaseUrlSettings";
@@ -57,7 +56,7 @@ class ConfigForm extends React.Component<Props, State> {
        pluginUrl: "",
        loginAttemptLimitTimeout: 0,
        enabledXsrfProtection: true,
-        defaultNamespaceStrategy: "",
+        namespaceStrategy: "",
        _links: {}
      },
      showNotification: false,
@@ -131,7 +130,7 @@ class ConfigForm extends React.Component<Props, State> {
          skipFailedAuthenticators={config.skipFailedAuthenticators}
          pluginUrl={config.pluginUrl}
          enabledXsrfProtection={config.enabledXsrfProtection}
-          defaultNamespaceStrategy={config.defaultNamespaceStrategy}
+          namespaceStrategy={config.namespaceStrategy}
          onChange={(isValid, changedValue, name) =>
            this.onChange(isValid, changedValue, name)
          }
--- a/scm-ui/src/config/components/form/GeneralSettings.js
+++ b/scm-ui/src/config/components/form/GeneralSettings.js
@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { Checkbox, InputField, Select } from "@scm-manager/ui-components";
+import { Checkbox, InputField} from "@scm-manager/ui-components";
 import type { NamespaceStrategies } from "@scm-manager/ui-types";
 import NamespaceStrategySelect from "./NamespaceStrategySelect";

@@ -14,7 +14,7 @@ type Props = {
  skipFailedAuthenticators: boolean,
  pluginUrl: string,
  enabledXsrfProtection: boolean,
-  defaultNamespaceStrategy: string,
+  namespaceStrategy: string,
  namespaceStrategies?: NamespaceStrategies,
  onChange: (boolean, any, string) => void,
  hasUpdatePermission: boolean,
@@ -35,7 +35,7 @@ class GeneralSettings extends React.Component<Props> {
      skipFailedAuthenticators,
      pluginUrl,
      enabledXsrfProtection,
-      defaultNamespaceStrategy,
+      namespaceStrategy,
      hasUpdatePermission,
      namespaceStrategies
    } = this.props;
@@ -74,12 +74,12 @@ class GeneralSettings extends React.Component<Props> {
                </div>
                <div className="column is-half">
                  <NamespaceStrategySelect
-                    label={t("general-settings.default-namespace-strategy")}
-                    onChange={this.handleDefaultNamespaceStrategyChange}
-                    value={defaultNamespaceStrategy}
+                    label={t("general-settings.namespace-strategy")}
+                    onChange={this.handleNamespaceStrategyChange}
+                    value={namespaceStrategy}
                    disabled={!hasUpdatePermission}
                    namespaceStrategies={namespaceStrategies}
-                    helpText={t("help.defaultNameSpaceStrategyHelpText")}
+                    helpText={t("help.nameSpaceStrategyHelpText")}
                  />
                </div>
            </div>
@@ -153,19 +153,17 @@ class GeneralSettings extends React.Component<Props> {
  handleAnonymousAccessEnabledChange = (value: string) => {
    this.props.onChange(true, value, "anonymousAccessEnabled");
  };
-
  handleSkipFailedAuthenticatorsChange = (value: string) => {
    this.props.onChange(true, value, "skipFailedAuthenticators");
  };
  handlePluginUrlChange = (value: string) => {
    this.props.onChange(true, value, "pluginUrl");
  };
-
  handleEnabledXsrfProtectionChange = (value: boolean) => {
    this.props.onChange(true, value, "enabledXsrfProtection");
  };
-  handleDefaultNamespaceStrategyChange = (value: string) => {
-    this.props.onChange(true, value, "defaultNamespaceStrategy");
+  handleNamespaceStrategyChange = (value: string) => {
+    this.props.onChange(true, value, "namespaceStrategy");
  };
 }

--- a/scm-ui/src/config/modules/config.test.js
+++ b/scm-ui/src/config/modules/config.test.js
@@ -50,7 +50,7 @@ const config = {
    "http://plugins.scm-manager.org/scm-plugin-backend/api/{version}/plugins?os={os}&arch={arch}&snapshot=false",
  loginAttemptLimitTimeout: 300,
  enabledXsrfProtection: true,
-  defaultNamespaceStrategy: "sonia.scm.repository.DefaultNamespaceStrategy",
+  namespaceStrategy: "UsernameNamespaceStrategy",
  _links: {
    self: { href: "http://localhost:8081/api/v2/config" },
    update: { href: "http://localhost:8081/api/v2/config" }
@@ -79,7 +79,7 @@ const configWithNullValues = {
    "http://plugins.scm-manager.org/scm-plugin-backend/api/{version}/plugins?os={os}&arch={arch}&snapshot=false",
  loginAttemptLimitTimeout: 300,
  enabledXsrfProtection: true,
-  defaultNamespaceStrategy: "sonia.scm.repository.DefaultNamespaceStrategy",
+  namespaceStrategy: "UsernameNamespaceStrategy",
  _links: {
    self: { href: "http://localhost:8081/api/v2/config" },
    update: { href: "http://localhost:8081/api/v2/config" }
--- a/scm-ui/src/config/modules/namespaceStrategies.js
+++ b/scm-ui/src/config/modules/namespaceStrategies.js
@@ -91,7 +91,7 @@ export default function reducer(
    const config = action.payload;
    return {
      ...state,
-      current: config.defaultNamespaceStrategy
+      current: config.namespaceStrategy
    };
  }
  return state;
--- a/scm-ui/src/config/modules/namespaceStrategies.test.js
+++ b/scm-ui/src/config/modules/namespaceStrategies.test.js
@@ -149,7 +149,7 @@ describe("namespace strategies reducer", () => {
    const modifyConfigAction = {
      type: MODIFY_CONFIG_SUCCESS,
      payload: {
-        defaultNamespaceStrategy: "CustomNamespaceStrategy"
+        namespaceStrategy: "CustomNamespaceStrategy"
      }
    };
    const newState = reducer(strategies, modifyConfigAction);
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ConfigDto.java
@@ -35,7 +35,7 @@ public class ConfigDto extends HalRepresentation {
  private String pluginUrl;
  private long loginAttemptLimitTimeout;
  private boolean enabledXsrfProtection;
-  private String defaultNamespaceStrategy;
+  private String namespaceStrategy;

  @Override
  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
--- a/scm-webapp/src/main/java/sonia/scm/repository/NamespaceStrategyProvider.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/NamespaceStrategyProvider.java
@@ -23,7 +23,7 @@ public class NamespaceStrategyProvider implements Provider<NamespaceStrategy> {

  @Override
  public NamespaceStrategy get() {
-    String namespaceStrategy = scmConfiguration.getDefaultNamespaceStrategy();
+    String namespaceStrategy = scmConfiguration.getNamespaceStrategy();

    for (NamespaceStrategy s : this.strategies) {
      if (s.getClass().getSimpleName().equals(namespaceStrategy)) {
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigDtoToScmConfigurationMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ConfigDtoToScmConfigurationMapperTest.java
@@ -51,7 +51,7 @@ public class ConfigDtoToScmConfigurationMapperTest {
    assertEquals("https://plug.ins" , config.getPluginUrl());
    assertEquals(40 , config.getLoginAttemptLimitTimeout());
    assertTrue(config.isEnabledXsrfProtection());
-    assertEquals("username", config.getDefaultNamespaceStrategy());
+    assertEquals("username", config.getNamespaceStrategy());
  }

  private ConfigDto createDefaultDto() {
@@ -76,7 +76,7 @@ public class ConfigDtoToScmConfigurationMapperTest {
    configDto.setPluginUrl("https://plug.ins");
    configDto.setLoginAttemptLimitTimeout(40);
    configDto.setEnabledXsrfProtection(true);
-    configDto.setDefaultNamespaceStrategy("username");
+    configDto.setNamespaceStrategy("username");

    return configDto;
  }
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ScmConfigurationToConfigDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ScmConfigurationToConfigDtoMapperTest.java
@@ -81,7 +81,7 @@ public class ScmConfigurationToConfigDtoMapperTest {
    assertEquals("pluginurl" , dto.getPluginUrl());
    assertEquals(2 , dto.getLoginAttemptLimitTimeout());
    assertTrue(dto.isEnabledXsrfProtection());
-    assertEquals("username", dto.getDefaultNamespaceStrategy());
+    assertEquals("username", dto.getNamespaceStrategy());

    assertEquals(expectedBaseUri.toString(), dto.getLinks().getLinkBy("self").get().getHref());
    assertEquals(expectedBaseUri.toString(), dto.getLinks().getLinkBy("update").get().getHref());
@@ -121,7 +121,7 @@ public class ScmConfigurationToConfigDtoMapperTest {
    config.setPluginUrl("pluginurl");
    config.setLoginAttemptLimitTimeout(2);
    config.setEnabledXsrfProtection(true);
-    config.setDefaultNamespaceStrategy("username");
+    config.setNamespaceStrategy("username");
    return config;
  }

--- a/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java
@@ -17,7 +17,7 @@ class NamespaceStrategyProviderTest {
    Set<NamespaceStrategy> strategies = allStrategiesAsSet();

    ScmConfiguration configuration = new ScmConfiguration();
-    configuration.setDefaultNamespaceStrategy("Arthur");
+    configuration.setNamespaceStrategy("Arthur");

    NamespaceStrategyProvider provider = new NamespaceStrategyProvider(strategies, configuration);
    NamespaceStrategy strategy = provider.get();
@@ -30,7 +30,7 @@ class NamespaceStrategyProviderTest {
    Set<NamespaceStrategy> strategies = Collections.emptySet();

    ScmConfiguration configuration = new ScmConfiguration();
-    configuration.setDefaultNamespaceStrategy("Arthur");
+    configuration.setNamespaceStrategy("Arthur");

    NamespaceStrategyProvider provider = new NamespaceStrategyProvider(strategies, configuration);
    NamespaceStrategy strategy = provider.get();