From 2ec98c2763f12706bce950018125baad3b190171 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Tue, 19 Nov 2019 14:04:47 +0100
Subject: [PATCH] remove repository public flag

---
 .../scm/repository/AbstactImportHandler.java  |  1 -
 .../java/sonia/scm/repository/Repository.java | 19 +------------------
 .../RepositoryDtoToRepositoryMapper.java      |  1 -
 .../AuthorizationChangedEventProducer.java    |  3 +--
 .../MigrateVerbsToPermissionRoles.java        |  1 -
 5 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
index 1f1e7cfefb..63d4638ab8 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java
@@ -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;
diff --git a/scm-core/src/main/java/sonia/scm/repository/Repository.java b/scm-core/src/main/java/sonia/scm/repository/Repository.java
index 463085a7ea..6b7df70081 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Repository.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Repository.java
@@ -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)
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDtoToRepositoryMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDtoToRepositoryMapper.java
index b9add14529..ab36672f83 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDtoToRepositoryMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryDtoToRepositoryMapper.java
@@ -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);
 
diff --git a/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java b/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
index fc653efa52..6914f89286 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/AuthorizationChangedEventProducer.java
@@ -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() {
diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/MigrateVerbsToPermissionRoles.java b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrateVerbsToPermissionRoles.java
index be40ab3a6d..fc2dec12a6 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/repository/MigrateVerbsToPermissionRoles.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/MigrateVerbsToPermissionRoles.java
@@ -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;
   }