introducing new ExtensionPoint for repository path matching

The new ExtensionPoint was introduced to  remove the tight coupling between the DefaultRepositoryManager and the GitRepositoryHandler.
Git has now its own RepositoryPathMatcher which allow the matching of repository with .git or without .git extension.

scm-webapp/src/test/java/sonia/scm/it/GitRepositoryPathMatcherITCase.java

@@ -0,0 +1,143 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+package sonia.scm.it;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import com.sun.jersey.api.client.Client;
+import java.io.File;
+import java.io.IOException;
+import org.junit.After;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import static sonia.scm.it.IntegrationTestUtil.*;
+import static sonia.scm.it.RepositoryITUtil.*;
+import sonia.scm.repository.Person;
+import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryTestData;
+import sonia.scm.repository.client.api.ClientCommand;
+import sonia.scm.repository.client.api.RepositoryClient;
+import sonia.scm.repository.client.api.RepositoryClientFactory;
+
+/**
+ * Integration test for RepositoryPathMatching with ".git" and without ".git".
+ * 
+ * @author Sebastian Sdorra
+ * @since 1.54
+ */
+public class GitRepositoryPathMatcherITCase {
+  
+  private static final RepositoryClientFactory REPOSITORY_CLIENT_FACTORY = new RepositoryClientFactory();
+  
+  @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+  
+  private Client apiClient;
+  private Repository repository;
+  
+  @Before
+  public void setUp() {
+    apiClient = createAdminClient();
+    Repository testRepository = RepositoryTestData.createHeartOfGold("git");
+    this.repository = createRepository(apiClient, testRepository);
+  }
+  
+  @After
+  public void tearDown() {
+    deleteRepository(apiClient, repository.getId());
+  }
+  
+  // tests begin
+  
+  @Test
+  public void testWithoutDotGit() throws IOException {
+    String urlWithoutDotGit = createUrl();
+    cloneAndPush(urlWithoutDotGit);
+  }
+  
+  @Test
+  public void testWithDotGit() throws IOException {
+    String urlWithDotGit = createUrl() + ".git";
+    cloneAndPush(urlWithDotGit);
+  }
+  
+  // tests end
+  
+  private String createUrl() {
+    return BASE_URL + "git/" + repository.getName();
+  }
+  
+  private void cloneAndPush( String url ) throws IOException {
+    cloneRepositoryAndPushFiles(url);
+    cloneRepositoryAndCheckFiles(url);
+  }
+  
+  private void cloneRepositoryAndPushFiles(String url) throws IOException {
+    RepositoryClient repositoryClient = createRepositoryClient(url);
+    
+    Files.write("a", new File(repositoryClient.getWorkingCopy(), "a.txt"), Charsets.UTF_8);
+    repositoryClient.getAddCommand().add("a.txt");
+    commit(repositoryClient, "added a");
+    
+    Files.write("b", new File(repositoryClient.getWorkingCopy(), "b.txt"), Charsets.UTF_8);
+    repositoryClient.getAddCommand().add("b.txt");
+    commit(repositoryClient, "added b");
+  }
+  
+  private void cloneRepositoryAndCheckFiles(String url) throws IOException {
+    RepositoryClient repositoryClient = createRepositoryClient(url);
+    File workingCopy = repositoryClient.getWorkingCopy();
+    
+    File a = new File(workingCopy, "a.txt");
+    assertTrue(a.exists());
+    assertEquals("a", Files.toString(a, Charsets.UTF_8));
+    
+    File b = new File(workingCopy, "b.txt");
+    assertTrue(b.exists());
+    assertEquals("b", Files.toString(b, Charsets.UTF_8));
+  }
+  
+   private void commit(RepositoryClient repositoryClient, String message) throws IOException {
+    repositoryClient.getCommitCommand().commit(
+      new Person("scmadmin", "scmadmin@scm-manager.org"), message
+    );
+    if ( repositoryClient.isCommandSupported(ClientCommand.PUSH) ) {
+      repositoryClient.getPushCommand().push();
+    }
+  }
+  
+  private RepositoryClient createRepositoryClient(String url) throws IOException {
+    return REPOSITORY_CLIENT_FACTORY.create("git", url, ADMIN_USERNAME, ADMIN_PASSWORD, tempFolder.newFolder());
+  }
+}

scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerPerfTest.java

@@ -117,6 +117,7 @@ public class DefaultRepositoryManagerPerfTest {
     Set<RepositoryHandler> handlerSet = ImmutableSet.of(repositoryHandler);
     Provider<Set<RepositoryListener>> repositoryListenersProvider = new SetProvider();
     Provider<Set<RepositoryHook>> repositoryHooksProvider = new SetProvider();
+    RepositoryMatcher repositoryMatcher = new RepositoryMatcher(Collections.<RepositoryPathMatcher>emptySet());
     
     repositoryManager = new DefaultRepositoryManager(
       configuration, 
@@ -126,7 +127,8 @@ public class DefaultRepositoryManagerPerfTest {
       handlerSet, 
       repositoryListenersProvider, 
       repositoryHooksProvider, 
-      preProcessorUtil
+      preProcessorUtil,
+      repositoryMatcher
     );
     
     setUpTestRepositories();

scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java

@@ -46,7 +46,6 @@ import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.store.JAXBStoreFactory;
 import sonia.scm.store.StoreFactory;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
 import static org.mockito.Mockito.*;
@@ -54,6 +53,7 @@ import static org.mockito.Mockito.*;
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.IOException;
+import java.util.Collections;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -77,45 +77,21 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
     throws RepositoryException, IOException
   {
     RepositoryManager m = createManager();
-
     m.init(contextProvider);
+    
     createRepository(m, new Repository("1", "hg", "scm"));
     createRepository(m, new Repository("2", "hg", "scm-test"));
     createRepository(m, new Repository("3", "git", "project1/test-1"));
     createRepository(m, new Repository("4", "git", "project1/test-2"));
+    
     assertEquals("scm", m.getFromUri("hg/scm").getName());
     assertEquals("scm-test", m.getFromUri("hg/scm-test").getName());
     assertEquals("scm-test", m.getFromUri("/hg/scm-test").getName());
-    assertEquals("project1/test-1",
-      m.getFromUri("/git/project1/test-1").getName());
-    assertEquals("project1/test-1",
-      m.getFromUri("/git/project1/test-1/ka/some/path").getName());
+    assertEquals("project1/test-1", m.getFromUri("/git/project1/test-1").getName());
+    assertEquals("project1/test-1", m.getFromUri("/git/project1/test-1/ka/some/path").getName());
     assertNull(m.getFromUri("/git/project1/test-3/ka/some/path"));
   }
 
-  @Test
-  public void testNameIsMatching() throws Exception {
-    DefaultRepositoryManager m = createManager();
-
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "repo-name"), is(true));
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "repo-name/"), is(true));
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "repo-name/and-more-is-valid"), is(true));
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "repo-name.git/and-more-is-valid"),
-               is(true));
-
-
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "not-the-name"), is(false));
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "repo-na"), is(false));
-
-    assertThat(m.isNameMatching(GitRepositoryHandler.TYPE_NAME, "repo-name", "/repo-name/"), is(false));
-
-    assertThat(m.isNameMatching(HgRepositoryHandler.TYPE_NAME, "repo-name", "repo-name.git/and-more-is-valid"),
-               is(false));
-    assertThat(m.isNameMatching(SvnRepositoryHandler.TYPE_NAME, "repo-name", "repo-name.git/and-more-is-valid"),
-               is(false));
-
-  }
-
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -180,7 +156,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
 
     return new DefaultRepositoryManager(configuration, contextProvider,
       new DefaultKeyGenerator(), repositoryDAO, handlerSet, listenerProvider,
-      hookProvider, createEmptyPreProcessorUtil());
+      hookProvider, createEmptyPreProcessorUtil(), createRepositoryMatcher());
   }
 
   /**
@@ -202,6 +178,10 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
     );
     //J+
   }
+          
+  private RepositoryMatcher createRepositoryMatcher() {
+    return new RepositoryMatcher(Collections.<RepositoryPathMatcher>emptySet());
+  }       
 
   /**
    * Method description

scm-webapp/src/test/java/sonia/scm/repository/RepositoryMatcherTest.java

@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+package sonia.scm.repository;
+
+import com.google.common.collect.Sets;
+import java.util.Set;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.Before;
+
+/**
+ * Unit tests for {@link RepositoryMatcher}.
+ * 
+ * @author Sebastian Sdorra
+ * @since 1.54
+ */
+public class RepositoryMatcherTest {
+  
+  private RepositoryMatcher matcher;
+  
+  @Before
+  public void setUp() {
+    Set<RepositoryPathMatcher> pathMatchers = Sets.<RepositoryPathMatcher>newHashSet(new AbcRepositoryPathMatcher());
+    this.matcher = new RepositoryMatcher(pathMatchers);
+  }
+
+  @Test
+  public void testMatches() {
+    assertFalse(matcher.matches(repository("hg", "scm"), "hg", "scm-test/ka"));
+    assertFalse(matcher.matches(repository("git", "scm-test"), "hg", "scm-test"));
+    
+    assertTrue(matcher.matches(repository("hg", "scm-test"), "hg", "scm-test/ka"));
+    assertTrue(matcher.matches(repository("hg", "scm-test"), "hg", "scm-test"));
+  }
+  
+  @Test
+  public void testMatchesWithCustomPathMatcher() {
+    assertFalse(matcher.matches(repository("abc", "scm"), "hg", "/long/path/with/abc"));
+    assertTrue(matcher.matches(repository("abc", "scm"), "abc", "/long/path/with/abc"));
+  }
+  
+  private Repository repository(String type, String name) {
+    return new Repository(type + "-" + name, type, name);
+  }
+  
+  private static class AbcRepositoryPathMatcher implements RepositoryPathMatcher {
+
+    @Override
+    public boolean isPathMatching(Repository repository, String path) {
+      return path.endsWith("abc");
+    }
+
+    @Override
+    public String getType() {
+      return "abc";
+    }
+    
+  }
+  
+}