diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java index 302523072a..42c46ac5d3 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/ScmBackendModule.java @@ -40,10 +40,10 @@ import com.google.inject.name.Names; import com.google.inject.servlet.ServletModule; import sonia.scm.ConfigurationException; -import sonia.scm.plugin.rest.url.BitbucketCompareUrlBuilder; -import sonia.scm.plugin.rest.url.CompareUrlBuilder; -import sonia.scm.plugin.rest.url.CompareUrlBuilderFactory; -import sonia.scm.plugin.rest.url.GithubCompareUrlBuilder; +import sonia.scm.plugin.rest.url.BitbucketUrlBuilder; +import sonia.scm.plugin.rest.url.UrlBuilder; +import sonia.scm.plugin.rest.url.UrlBuilderFactory; +import sonia.scm.plugin.rest.url.GithubUrlBuilder; import sonia.scm.plugin.scanner.DefaultPluginScannerFactory; import sonia.scm.plugin.scanner.PluginScannerFactory; import sonia.scm.plugin.scanner.PluginScannerScheduler; @@ -125,14 +125,14 @@ public class ScmBackendModule extends ServletModule bind(PluginScannerScheduler.class).to(TimerPluginScannerScheduler.class); // compare url builder - Multibinder compareUrlBuilderBinder = - Multibinder.newSetBinder(binder(), CompareUrlBuilder.class); + Multibinder compareUrlBuilderBinder = + Multibinder.newSetBinder(binder(), UrlBuilder.class); - compareUrlBuilderBinder.addBinding().to(BitbucketCompareUrlBuilder.class); - compareUrlBuilderBinder.addBinding().to(GithubCompareUrlBuilder.class); + compareUrlBuilderBinder.addBinding().to(BitbucketUrlBuilder.class); + compareUrlBuilderBinder.addBinding().to(GithubUrlBuilder.class); // compare url builder factory - bind(CompareUrlBuilderFactory.class); + bind(UrlBuilderFactory.class); // news proxy bind(ProxyURLProvider.class).to(NewsProxyURLProvider.class); diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DetailResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DetailResource.java index f5c7fc89ee..631e9d31e6 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DetailResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DetailResource.java @@ -42,8 +42,8 @@ import sonia.scm.plugin.PluginBackend; import sonia.scm.plugin.PluginInformation; import sonia.scm.plugin.PluginInformationVersionComparator; import sonia.scm.plugin.PluginUtil; -import sonia.scm.plugin.rest.url.CompareUrlBuilder; -import sonia.scm.plugin.rest.url.CompareUrlBuilderFactory; +import sonia.scm.plugin.rest.url.UrlBuilder; +import sonia.scm.plugin.rest.url.UrlBuilderFactory; import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ @@ -88,7 +88,7 @@ public class DetailResource extends ViewableResource @Inject public DetailResource(ServletContext context, PluginBackend backend, BackendConfiguration configuration, - CompareUrlBuilderFactory urlFactory) + UrlBuilderFactory urlFactory) { super(context, configuration); this.backend = backend; @@ -158,7 +158,7 @@ public class DetailResource extends ViewableResource PluginInformationVersionComparator.INSTANCE); Iterator pluginIterator = pluginVersions.iterator(); - CompareUrlBuilder urlBuilder = urlFactory.createCompareUrlBuilder(latest); + UrlBuilder urlBuilder = urlFactory.createCompareUrlBuilder(latest); PluginInformation last = null; while (pluginIterator.hasNext()) @@ -191,5 +191,5 @@ public class DetailResource extends ViewableResource private PluginBackend backend; /** Field description */ - private CompareUrlBuilderFactory urlFactory; + private UrlBuilderFactory urlFactory; } diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractUrlBuilder.java similarity index 95% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractUrlBuilder.java index 0d7c0b4b99..3cd30be71e 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractCompareUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractUrlBuilder.java @@ -53,12 +53,12 @@ import java.text.MessageFormat; * * @author Sebastian Sdorra */ -public abstract class AbstractCompareUrlBuilder implements CompareUrlBuilder +public abstract class AbstractUrlBuilder implements UrlBuilder { - /** the logger for AbstractCompareUrlBuilder */ + /** the logger for AbstractUrlBuilder */ private static final Logger logger = - LoggerFactory.getLogger(AbstractCompareUrlBuilder.class); + LoggerFactory.getLogger(AbstractUrlBuilder.class); //~--- get methods ---------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketUrlBuilder.java similarity index 96% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketUrlBuilder.java index 8717cbe928..d849ff1668 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketUrlBuilder.java @@ -37,7 +37,7 @@ package sonia.scm.plugin.rest.url; * * @author Sebastian Sdorra */ -public class BitbucketCompareUrlBuilder extends AbstractCompareUrlBuilder +public class BitbucketUrlBuilder extends AbstractUrlBuilder { /** Field description */ diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubUrlBuilder.java similarity index 96% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubUrlBuilder.java index 00a3c1f0a0..dfeeeb2ac9 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubUrlBuilder.java @@ -37,7 +37,7 @@ package sonia.scm.plugin.rest.url; * * @author Sebastian Sdorra */ -public class GithubCompareUrlBuilder extends AbstractCompareUrlBuilder +public class GithubUrlBuilder extends AbstractUrlBuilder { /** Field description */ diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/CompareUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilder.java similarity index 98% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/CompareUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilder.java index 072e636090..43eac2126e 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/CompareUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilder.java @@ -41,7 +41,7 @@ import sonia.scm.plugin.PluginInformation; * * @author Sebastian Sdorra */ -public interface CompareUrlBuilder +public interface UrlBuilder { /** diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/CompareUrlBuilderFactory.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilderFactory.java similarity index 87% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/CompareUrlBuilderFactory.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilderFactory.java index b61122d000..b1d2e02758 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/CompareUrlBuilderFactory.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilderFactory.java @@ -50,7 +50,7 @@ import java.util.Set; * @author Sebastian Sdorra */ @Singleton -public class CompareUrlBuilderFactory +public class UrlBuilderFactory { /** @@ -60,7 +60,7 @@ public class CompareUrlBuilderFactory * @param urlBuilderSet */ @Inject - public CompareUrlBuilderFactory(Set urlBuilderSet) + public UrlBuilderFactory(Set urlBuilderSet) { this.urlBuilderSet = urlBuilderSet; } @@ -75,13 +75,13 @@ public class CompareUrlBuilderFactory * * @return */ - public CompareUrlBuilder createCompareUrlBuilder(String pluginUrl) + public UrlBuilder createCompareUrlBuilder(String pluginUrl) { - CompareUrlBuilder builder = null; + UrlBuilder builder = null; if (Util.isNotEmpty(pluginUrl) && Util.isNotEmpty(urlBuilderSet)) { - for (CompareUrlBuilder cup : urlBuilderSet) + for (UrlBuilder cup : urlBuilderSet) { if (cup.isCompareable(pluginUrl)) { @@ -103,7 +103,7 @@ public class CompareUrlBuilderFactory * * @return */ - public CompareUrlBuilder createCompareUrlBuilder(PluginInformation plugin) + public UrlBuilder createCompareUrlBuilder(PluginInformation plugin) { return createCompareUrlBuilder(plugin.getUrl()); } @@ -111,5 +111,5 @@ public class CompareUrlBuilderFactory //~--- fields --------------------------------------------------------------- /** Field description */ - private Set urlBuilderSet; + private Set urlBuilderSet; } diff --git a/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilderTest.java b/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilderTest.java index e5a7659fa0..6e90943e6e 100644 --- a/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilderTest.java +++ b/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/BitbucketCompareUrlBuilderTest.java @@ -53,7 +53,7 @@ public class BitbucketCompareUrlBuilderTest @Test public void createCompareUrlTest() { - BitbucketCompareUrlBuilder b = new BitbucketCompareUrlBuilder(); + BitbucketUrlBuilder b = new BitbucketUrlBuilder(); String url = b.createCompareUrl("https://bitbucket.org/sdorra/scm-manager", "1.8", "1.9"); @@ -70,7 +70,7 @@ public class BitbucketCompareUrlBuilderTest @Test public void isCompareableTest() { - BitbucketCompareUrlBuilder b = new BitbucketCompareUrlBuilder(); + BitbucketUrlBuilder b = new BitbucketUrlBuilder(); assertFalse(b.isCompareable("https://github.com.org/sdorra/scm-manager")); assertFalse(b.isCompareable("https://google.com")); diff --git a/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilderTest.java b/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilderTest.java index 1c4bd4a467..2740b1da20 100644 --- a/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilderTest.java +++ b/scm-plugin-backend/src/test/java/sonia/scm/plugin/rest/url/GithubCompareUrlBuilderTest.java @@ -53,7 +53,7 @@ public class GithubCompareUrlBuilderTest @Test public void createCompareUrlTest() { - GithubCompareUrlBuilder g = new GithubCompareUrlBuilder(); + GithubUrlBuilder g = new GithubUrlBuilder(); String url = g.createCompareUrl("https://github.com/sdorra/scm-manager", "1.8", "1.9"); @@ -70,7 +70,7 @@ public class GithubCompareUrlBuilderTest @Test public void isCompareableTest() { - GithubCompareUrlBuilder g = new GithubCompareUrlBuilder(); + GithubUrlBuilder g = new GithubUrlBuilder(); assertTrue(g.isCompareable("https://github.com.org/sdorra/scm-manager")); assertFalse(g.isCompareable("https://google.com"));