Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-29 18:59:11 +01:00
Code Issues Packages Projects Releases Activity

Heed peer review remarks

Browse Source
This commit is contained in:
René Pfeuffer
2020-09-18 16:02:20 +02:00
parent 70dcb9ca81
commit b1c0ec15a7
11 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/api/v2/resources/NamespacePermissionResource.java
View File

@@ -60,10 +60,10 @@ import static sonia.scm.api.v2.resources.RepositoryPermissionDto.GROUP_PREFIX;
@Slf4j
public class NamespacePermissionResource {
private RepositoryPermissionDtoToRepositoryPermissionMapper dtoToModelMapper;
private RepositoryPermissionToRepositoryPermissionDtoMapper modelToDtoMapper;
private RepositoryPermissionCollectionToDtoMapper repositoryPermissionCollectionToDtoMapper;
private ResourceLinks resourceLinks;
private final RepositoryPermissionDtoToRepositoryPermissionMapper dtoToModelMapper;
private final RepositoryPermissionToRepositoryPermissionDtoMapper modelToDtoMapper;
private final RepositoryPermissionCollectionToDtoMapper repositoryPermissionCollectionToDtoMapper;
private final ResourceLinks resourceLinks;
private final NamespaceManager manager;
@Inject
@@ -234,7 +234,6 @@ public class NamespacePermissionResource {
public void update(@PathParam("namespace") String namespaceName,
@PathParam("permission-name") String permissionName,
@Valid RepositoryPermissionDto permission) {
log.info("try to update the permission with name: {}. the modified permission is: {}", permissionName, permission);
Namespace namespace = load(namespaceName);
String extractedPermissionName = getPermissionName(permissionName);
if (!isPermissionExist(new RepositoryPermissionDto(extractedPermissionName, isGroupPermission(permissionName)), namespace)) {
@@ -256,7 +255,7 @@ public class NamespacePermissionResource {
}
namespace.addPermission(newPermission);
manager.modify(namespace);
log.info("the permission with name: {} is updated.", permissionName);
log.info("the permission with name: {} is updated to {}.", permissionName, permission);
}
/**
@@ -296,7 +295,8 @@ public class NamespacePermissionResource {
private Predicate<RepositoryPermission> filterPermission(String name) {
return permission ->
getPermissionName(name).equals(permission.getName()) && permission.isGroupPermission() == isGroupPermission(name);
getPermissionName(name).equals(permission.getName())
&& permission.isGroupPermission() == isGroupPermission(name);
}
private String getPermissionName(String permissionName) {

9
scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceManager.java
View File

@@ -80,8 +80,7 @@ public class DefaultNamespaceManager implements NamespaceManager {
@Subscribe
public void cleanupDeletedNamespaces(RepositoryEvent repositoryEvent) {
HandlerEventType eventType = repositoryEvent.getEventType();
if (eventType == HandlerEventType.DELETE || eventType == HandlerEventType.MODIFY && !repositoryEvent.getItem().getNamespace().equals(repositoryEvent.getOldItem().getNamespace())) {
if (namespaceRelevantChange(repositoryEvent)) {
Collection<String> allNamespaces = repositoryManager.getAllNamespaces();
String oldNamespace = getOldNamespace(repositoryEvent);
if (!allNamespaces.contains(oldNamespace)) {
@@ -90,6 +89,12 @@ public class DefaultNamespaceManager implements NamespaceManager {
}
}
public boolean namespaceRelevantChange(RepositoryEvent repositoryEvent) {
HandlerEventType eventType = repositoryEvent.getEventType();
return eventType == HandlerEventType.DELETE
|| eventType == HandlerEventType.MODIFY && !repositoryEvent.getItem().getNamespace().equals(repositoryEvent.getOldItem().getNamespace());
}
public String getOldNamespace(RepositoryEvent repositoryEvent) {
if (repositoryEvent.getEventType() == HandlerEventType.DELETE) {
return repositoryEvent.getItem().getNamespace();