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

remove repository public flag

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-11-19 14:04:47 +01:00
parent dd8f84e7c4
commit 2ec98c2763
5 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
View File

@@ -113,7 +113,6 @@ public abstract class AbstactImportHandler implements AdvancedImportHandler
Repository repository = new Repository();
repository.setName(repositoryName);
repository.setPublicReadable(false);
repository.setType(getTypeName());
return repository;

19
scm-core/src/main/java/sonia/scm/repository/Repository.java
View File

@@ -84,7 +84,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
@XmlElement(name = "permission")
private Set<RepositoryPermission> permissions = new HashSet<>();
@XmlElement(name = "public")
private boolean publicReadable = false;
private String type;
@@ -225,15 +224,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
return Util.isEmpty(healthCheckFailures);
}
/**
* Returns true if the {@link Repository} is public readable.
*
* @return true if the {@link Repository} is public readable
*/
public boolean isPublicReadable() {
return publicReadable;
}
/**
* Returns true if the {@link Repository} is valid.
* <ul>
@@ -292,10 +282,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
return this.permissions.remove(permission);
}
public void setPublicReadable(boolean publicReadable) {
this.publicReadable = publicReadable;
}
public void setType(String type) {
this.type = type;
}
@@ -332,7 +318,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
repository.setLastModified(lastModified);
repository.setDescription(description);
repository.setPermissions(permissions);
repository.setPublicReadable(publicReadable);
// do not copy health check results
}
@@ -360,7 +345,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
&& Objects.equal(name, other.name)
&& Objects.equal(contact, other.contact)
&& Objects.equal(description, other.description)
&& Objects.equal(publicReadable, other.publicReadable)
&& Objects.equal(permissions, other.permissions)
&& Objects.equal(type, other.type)
&& Objects.equal(creationDate, other.creationDate)
@@ -371,7 +355,7 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
@Override
public int hashCode() {
return Objects.hashCode(id, namespace, name, contact, description, publicReadable,
return Objects.hashCode(id, namespace, name, contact, description,
permissions, type, creationDate, lastModified, properties,
healthCheckFailures);
}
@@ -384,7 +368,6 @@ public class Repository extends BasicPropertiesAware implements ModelObject, Per
.add("name", name)
.add("contact", contact)
.add("description", description)
.add("publicReadable", publicReadable)
.add("permissions", permissions)
.add("type", type)
.add("lastModified", lastModified)

1
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDtoToRepositoryMapper.java
View File

@@ -8,7 +8,6 @@ public abstract class RepositoryDtoToRepositoryMapper extends BaseDtoMapper {
@Mapping(target = "creationDate", ignore = true)
@Mapping(target = "id", ignore = true)
@Mapping(target = "publicReadable", ignore = true)
@Mapping(target = "healthCheckFailures", ignore = true)
public abstract Repository map(RepositoryDto repositoryDto, @Context String id);

3
scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
View File

@@ -168,8 +168,7 @@ public class AuthorizationChangedEventProducer {
}
private boolean isAuthorizationDataModified(Repository repository, Repository beforeModification) {
return repository.isPublicReadable() != beforeModification.isPublicReadable()
|| !(repository.getPermissions().containsAll(beforeModification.getPermissions()) && beforeModification.getPermissions().containsAll(repository.getPermissions()));
return !(repository.getPermissions().containsAll(beforeModification.getPermissions()) && beforeModification.getPermissions().containsAll(repository.getPermissions()));
}
private void fireEventForEveryUser() {

1
scm-webapp/src/main/java/sonia/scm/update/repository/MigrateVerbsToPermissionRoles.java
View File

@@ -90,7 +90,6 @@ public class MigrateVerbsToPermissionRoles implements UpdateStep {
repository.setCreationDate(oldRepository.creationDate);
repository.setHealthCheckFailures(oldRepository.healthCheckFailures);
repository.setLastModified(oldRepository.lastModified);
repository.setPublicReadable(oldRepository.publicReadable);
return repository;
}