Cleanup repository dao

scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java

@@ -104,23 +104,21 @@ public class XmlRepositoryDAO implements RepositoryDAO {
   public void add(Repository repository) {
     Repository clone = repository.clone();
 
-    try {
+    synchronized (this) {
-      synchronized (this) {
+      Path repositoryPath = repositoryLocationResolver.create(repository.getId());
-        Path repositoryPath = repositoryLocationResolver.create(repository.getId());
-        Path resolvedPath = repositoryPath;
-        fileSystem.create(resolvedPath.toFile());
 
-        Path metadataPath = resolveDataPath(resolvedPath);
+      try {
+        Path metadataPath = resolveDataPath(repositoryPath);
         metadataStore.write(metadataPath, repository);
-
+      } catch (Exception e) {
-        byId.put(repository.getId(), clone);
+        repositoryLocationResolver.remove(repository.getId());
-        byNamespaceAndName.put(repository.getNamespaceAndName(), clone);
+        throw new InternalRepositoryException(repository, "failed to create filesystem", e);
       }
 
-    } catch (Exception e) {
+      byId.put(repository.getId(), clone);
-      repositoryLocationResolver.remove(repository.getId());
+      byNamespaceAndName.put(repository.getNamespaceAndName(), clone);
-      throw new InternalRepositoryException(repository, "failed to create filesystem", e);
     }
+
   }
 
 

scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java

@@ -14,26 +14,14 @@ import org.mockito.quality.Strictness;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.io.DefaultFileSystem;
 import sonia.scm.io.FileSystem;
-import sonia.scm.repository.InitialRepositoryLocationResolver;
-import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
-import sonia.scm.repository.RepositoryLocationResolver;
-import sonia.scm.repository.RepositoryPermission;
-import sonia.scm.repository.RepositoryTestData;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Clock;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicLong;
 
-import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @ExtendWith({MockitoExtension.class, TempDirectory.class})
@@ -52,31 +40,25 @@ class XmlRepositoryDAOTest {
 
   private XmlRepositoryDAO dao;
 
-  private Path baseDirectory;
+  private Path basePath;
-
-  private AtomicLong atomicClock;
 
   @BeforeEach
-  void createDAO(@TempDirectory.TempDir Path baseDirectory) {
+  void createDAO(@TempDirectory.TempDir Path basePath) {
-    this.baseDirectory = baseDirectory;
+    this.basePath = basePath;
-    this.atomicClock = new AtomicLong();
 
-    when(locationResolver.create("42")).thenReturn(Paths.get("repos", "42"));
+    when(locationResolver.create(anyString())).thenAnswer(invocation -> {
-    when(locationResolver.create("23")).thenReturn(Paths.get("repos", "puzzle"));
+      Path resolvedPath = basePath.resolve(invocation.getArgument(0).toString());
-
+      Files.createDirectories(resolvedPath);
-    when(context.getBaseDirectory()).thenReturn(baseDirectory.toFile());
+      return resolvedPath;
-    when(context.resolve(any(Path.class))).then(ic -> {
-      Path path = ic.getArgument(0);
-      return baseDirectory.resolve(path);
     });
+    when(locationResolver.remove(anyString())).thenAnswer(invocation -> basePath.resolve(invocation.getArgument(0).toString()));
+
+    when(context.getBaseDirectory()).thenReturn(basePath.toFile());
 
     dao = createDAO();
   }
 
   private XmlRepositoryDAO createDAO() {
-    Clock clock = mock(Clock.class);
-    when(clock.millis()).then(ic -> atomicClock.incrementAndGet());
-
     return new XmlRepositoryDAO(context, locationResolver, fileSystem);
   }
 
@@ -87,14 +69,14 @@ class XmlRepositoryDAOTest {
 
   @Test
   void shouldReturnCreationTimeOfLocationResolver() {
-    long now = atomicClock.get();
+    long now = 42L;
     when(locationResolver.getCreationTime()).thenReturn(now);
     assertThat(dao.getCreationTime()).isEqualTo(now);
   }
 
   @Test
   void shouldReturnLasModifiedOfLocationResolver() {
-    long now = atomicClock.get();
+    long now = 42L;
     when(locationResolver.getLastModified()).thenReturn(now);
     assertThat(dao.getLastModified()).isEqualTo(now);
   }
@@ -108,6 +90,36 @@ class XmlRepositoryDAOTest {
     assertThat(dao.contains(REPOSITORY.getNamespaceAndName())).isTrue();
   }
 
+  @Test
+  void shouldPersistRepository() {
+    dao.add(REPOSITORY);
+
+    String content = getXmlFileContent(REPOSITORY.getId());
+
+    assertThat(content).contains("<id>42</id>");
+  }
+
+  @Test
+  void shouldDeleteDataFile() {
+    dao.add(REPOSITORY);
+    dao.delete(REPOSITORY);
+
+    assertThat(metadataFile(REPOSITORY.getId())).doesNotExist();
+  }
+
+  @Test
+  void shouldModifyRepository() {
+    dao.add(REPOSITORY);
+    Repository changedRepository = REPOSITORY.clone();
+    changedRepository.setContact("change");
+
+    dao.modify(changedRepository);
+
+    String content = getXmlFileContent(REPOSITORY.getId());
+
+    assertThat(content).contains("change");
+  }
+
 //  @Test
 //  void shouldReturnFalseForEachContainsMethod() {
 //    Repository heartOfGold = createHeartOfGold();
@@ -375,6 +387,25 @@ class XmlRepositoryDAOTest {
 //    assertThat(dao.getLastModified()).isEqualTo(lastModified);
 //  }
 
+  private String getXmlFileContent(String id) {
+    Path storePath = metadataFile(id);
+
+    assertThat(storePath).isRegularFile();
+    return content(storePath);
+  }
+
+  private Path metadataFile(String id) {
+    return locationResolver.create(id).resolve("metadata.xml");
+  }
+
+  private String content(Path storePath) {
+    try {
+      return new String(Files.readAllBytes(storePath), Charsets.UTF_8);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   private static Repository createRepository(String id) {
     return new Repository(id, "xml", "space", "id");
   }