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

Use default implementation to keep compatibility

Browse Source
This commit is contained in:
René Pfeuffer
2020-07-01 17:42:30 +02:00
parent 63692d497a
commit a0d9bacd80
7 changed files with 11 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/repository/NamespaceStrategy.java
View File

@@ -45,5 +45,7 @@ public interface NamespaceStrategy {
*
* @return namespace can be changed
*/
boolean canBeChanged();
default boolean canBeChanged() {
return false;
}
}

5
scm-webapp/src/main/java/sonia/scm/repository/CurrentYearNamespaceStrategy.java
View File

@@ -50,9 +50,4 @@ public class CurrentYearNamespaceStrategy implements NamespaceStrategy {
public String createNamespace(Repository repository) {
return String.valueOf(Year.now(clock).getValue());
}
@Override
public boolean canBeChanged() {
return false;
}
}

7
scm-webapp/src/main/java/sonia/scm/repository/RepositoryTypeNamespaceStrategy.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import sonia.scm.plugin.Extension;
@@ -32,9 +32,4 @@ public class RepositoryTypeNamespaceStrategy implements NamespaceStrategy {
public String createNamespace(Repository repository) {
return repository.getType();
}
@Override
public boolean canBeChanged() {
return false;
}
}

7
scm-webapp/src/main/java/sonia/scm/repository/UsernameNamespaceStrategy.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import org.apache.shiro.SecurityUtils;
@@ -34,9 +34,4 @@ public class UsernameNamespaceStrategy implements NamespaceStrategy {
public String createNamespace(Repository repository) {
return SecurityUtils.getSubject().getPrincipal().toString();
}
@Override
public boolean canBeChanged() {
return false;
}
}

19
scm-webapp/src/test/java/sonia/scm/api/v2/resources/NamespaceStrategyResourceTest.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.api.v2.resources;
import com.google.common.collect.Lists;
@@ -68,7 +68,7 @@ class NamespaceStrategyResourceTest {
}
private Set<NamespaceStrategy> allStrategies() {
return strategies(new AwesomeNamespaceStrategy(), new SuperNamespaceStrategy(), new MegaNamespaceStrategy());
return strategies(new AwesomeNamespaceStrategy(), new SuperNamespaceStrategy(), new MegaNamespaceStrategy());
}
private Set<NamespaceStrategy> strategies(NamespaceStrategy... strategies) {
@@ -80,11 +80,6 @@ class NamespaceStrategyResourceTest {
public String createNamespace(Repository repository) {
return "awesome";
}
@Override
public boolean canBeChanged() {
return false;
}
}
private static class SuperNamespaceStrategy implements NamespaceStrategy {
@@ -92,11 +87,6 @@ class NamespaceStrategyResourceTest {
public String createNamespace(Repository repository) {
return "super";
}
@Override
public boolean canBeChanged() {
return false;
}
}
private static class MegaNamespaceStrategy implements NamespaceStrategy {
@@ -104,10 +94,5 @@ class NamespaceStrategyResourceTest {
public String createNamespace(Repository repository) {
return "mega";
}
@Override
public boolean canBeChanged() {
return false;
}
}
}

19
scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyProviderTest.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import org.junit.jupiter.api.Test;
@@ -66,17 +66,12 @@ class NamespaceStrategyProviderTest {
return new LinkedHashSet<>(Arrays.asList(new Trillian(), new Zaphod(), new Arthur()));
}
private static class Trillian implements NamespaceStrategy {
private static class Trillian implements NamespaceStrategy{
@Override
public String createNamespace(Repository repository) {
return "trillian";
}
@Override
public boolean canBeChanged() {
return false;
}
}
private static class Zaphod implements NamespaceStrategy {
@@ -85,11 +80,6 @@ class NamespaceStrategyProviderTest {
public String createNamespace(Repository repository) {
return "zaphod";
}
@Override
public boolean canBeChanged() {
return false;
}
}
private static class Arthur implements NamespaceStrategy {
@@ -98,11 +88,6 @@ class NamespaceStrategyProviderTest {
public String createNamespace(Repository repository) {
return "arthur";
}
@Override
public boolean canBeChanged() {
return false;
}
}
}

9
scm-webapp/src/test/java/sonia/scm/repository/NamespaceStrategyValidatorTest.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
import com.google.common.collect.Sets;
@@ -30,7 +30,7 @@ import sonia.scm.ScmConstraintViolationException;
import java.util.Collections;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.*;
class NamespaceStrategyValidatorTest {
@@ -52,11 +52,6 @@ class NamespaceStrategyValidatorTest {
public String createNamespace(Repository repository) {
return null;
}
@Override
public boolean canBeChanged() {
return false;
}
}
}