From 6c0277e6576631bfa13fb10aa7208095041d9918 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Tue, 7 Jul 2020 09:58:48 +0200
Subject: [PATCH] remove obsolete extensionpoint

---
 .../v2/resources}/BranchLinkProvider.java                 | 8 +++-----
 .../scm/api/v2/resources/DefaultBranchLinkProvider.java   | 3 ---
 .../sonia/scm/lifecycle/modules/ScmServletModule.java     | 3 ++-
 3 files changed, 5 insertions(+), 9 deletions(-)
 rename scm-core/src/main/java/sonia/scm/{repository => api/v2/resources}/BranchLinkProvider.java (91%)

diff --git a/scm-core/src/main/java/sonia/scm/repository/BranchLinkProvider.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/BranchLinkProvider.java
similarity index 91%
rename from scm-core/src/main/java/sonia/scm/repository/BranchLinkProvider.java
rename to scm-core/src/main/java/sonia/scm/api/v2/resources/BranchLinkProvider.java
index 858b69532c..6f526ecabf 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BranchLinkProvider.java
+++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/BranchLinkProvider.java
@@ -22,19 +22,17 @@
  * SOFTWARE.
  */
 
-package sonia.scm.repository;
+package sonia.scm.api.v2.resources;
 
-import sonia.scm.plugin.ExtensionPoint;
+import sonia.scm.repository.NamespaceAndName;
 
-@ExtensionPoint
 public interface BranchLinkProvider {
 
   /**
    * Returns the internal api link for the given branch of the repository.
    *
    * @param namespaceAndName The namespace and name of the repository.
-   * @param branch       The name of the branch.
-   *
+   * @param branch           The name of the branch.
    * @return Internal api link for the given branch.
    */
   String get(NamespaceAndName namespaceAndName, String branch);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultBranchLinkProvider.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultBranchLinkProvider.java
index ef89027651..23e279148b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultBranchLinkProvider.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultBranchLinkProvider.java
@@ -24,13 +24,10 @@
 
 package sonia.scm.api.v2.resources;
 
-import sonia.scm.plugin.Extension;
-import sonia.scm.repository.BranchLinkProvider;
 import sonia.scm.repository.NamespaceAndName;
 
 import javax.inject.Inject;
 
-@Extension
 public class DefaultBranchLinkProvider implements BranchLinkProvider {
 
   private final ResourceLinks resourceLinks;
diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java
index dca5afa806..ea87ba0b4f 100644
--- a/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java
@@ -37,6 +37,7 @@ import sonia.scm.PushStateDispatcher;
 import sonia.scm.PushStateDispatcherProvider;
 import sonia.scm.Undecorated;
 import sonia.scm.api.rest.ObjectMapperProvider;
+import sonia.scm.api.v2.resources.BranchLinkProvider;
 import sonia.scm.api.v2.resources.DefaultBranchLinkProvider;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.cache.GuavaCacheManager;
@@ -61,7 +62,6 @@ import sonia.scm.net.ahc.XmlContentTransformer;
 import sonia.scm.plugin.DefaultPluginManager;
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.plugin.PluginManager;
-import sonia.scm.repository.BranchLinkProvider;
 import sonia.scm.repository.DefaultRepositoryManager;
 import sonia.scm.repository.DefaultRepositoryProvider;
 import sonia.scm.repository.DefaultRepositoryRoleManager;
@@ -237,6 +237,7 @@ class ScmServletModule extends ServletModule {
     bind(AccessTokenCookieIssuer.class).to(DefaultAccessTokenCookieIssuer.class);
     bind(PushStateDispatcher.class).toProvider(PushStateDispatcherProvider.class);
 
+    // bind api link provider
     bind(BranchLinkProvider.class).to(DefaultBranchLinkProvider.class);
   }