From 41ba13014a3e8fc142bc9d29087bf6c632d97b73 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 6 Jan 2013 14:49:14 +0100 Subject: [PATCH] package refactoring --- .../java/sonia/scm/plugin/BaseDirectory.java | 6 ++--- .../PluginInformationNameComparator.java | 2 +- .../PluginInformationVersionComparator.java | 4 ++-- .../java/sonia/scm/plugin/PluginUtil.java | 14 +++++------ .../java/sonia/scm/plugin/RedirectFilter.java | 6 ++++- .../src/main/java/sonia/scm/plugin/Roles.java | 5 ++++ .../sonia/scm/plugin/ScmBackendModule.java | 10 ++++---- .../rest/FreemarkerTemplateProvider.java | 4 ++-- .../rest/PluginInformationComparator.java | 2 +- .../scm/plugin/rest/ViewableResource.java | 2 +- .../rest/{ => admin}/AdminResource.java | 3 ++- .../rest/{ => api}/DefaultPluginFilter.java | 11 +++++---- .../plugin/rest/{ => api}/PluginResource.java | 21 ++++++++-------- .../rest/{ => error}/ErrorResource.java | 3 ++- .../rest/{ => page}/DetailResource.java | 24 +++++++++---------- .../plugin/rest/{ => page}/LoginResource.java | 5 ++-- .../rest/{ => page}/OverviewResource.java | 6 +++-- .../rest/{ => page}/PluginDetailWrapper.java | 2 +- .../rest/{ => page}/ScreenshotResource.java | 10 ++++---- .../plugin/scanner/PluginScannerRunnable.java | 2 +- .../scanner/PluginScannerTimerTask.java | 5 ++-- .../scanner/TimerPluginScannerScheduler.java | 5 ++-- .../{rest => }/url/AbstractUrlBuilder.java | 11 ++++----- .../{rest => }/url/BitbucketUrlBuilder.java | 2 +- .../{rest => }/url/GithubUrlBuilder.java | 2 +- .../scm/plugin/{rest => }/url/UrlBuilder.java | 5 ++-- .../{rest => }/url/UrlBuilderFactory.java | 2 +- .../webapp/WEB-INF/ftl/{ => page}/detail.html | 4 ++-- .../webapp/WEB-INF/ftl/{ => page}/index.html | 4 ++-- .../webapp/WEB-INF/ftl/{ => page}/login.html | 4 ++-- .../url/BitbucketCompareUrlBuilderTest.java | 1 + .../rest/url/GithubCompareUrlBuilderTest.java | 1 + 32 files changed, 99 insertions(+), 89 deletions(-) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => admin}/AdminResource.java (97%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => api}/DefaultPluginFilter.java (91%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => api}/PluginResource.java (92%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => error}/ErrorResource.java (97%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => page}/DetailResource.java (90%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => page}/LoginResource.java (95%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => page}/OverviewResource.java (96%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => page}/PluginDetailWrapper.java (98%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/{ => page}/ScreenshotResource.java (97%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/{rest => }/url/AbstractUrlBuilder.java (92%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/{rest => }/url/BitbucketUrlBuilder.java (98%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/{rest => }/url/GithubUrlBuilder.java (98%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/{rest => }/url/UrlBuilder.java (93%) rename scm-plugin-backend/src/main/java/sonia/scm/plugin/{rest => }/url/UrlBuilderFactory.java (98%) rename scm-plugin-backend/src/main/webapp/WEB-INF/ftl/{ => page}/detail.html (97%) rename scm-plugin-backend/src/main/webapp/WEB-INF/ftl/{ => page}/index.html (89%) rename scm-plugin-backend/src/main/webapp/WEB-INF/ftl/{ => page}/login.html (85%) diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/BaseDirectory.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/BaseDirectory.java index d6e1c415d5..f12fb4e032 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/BaseDirectory.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/BaseDirectory.java @@ -47,15 +47,15 @@ import java.io.File; public class BaseDirectory { + /** Field description */ + static final String DIRECTORY_PROPERTY = "scm-backend.home"; + /** Field description */ private static final String DIRECTORY_DEFAULT = ".scm-backend"; /** Field description */ private static final String DIRECTORY_ENVIRONMENT = "SCMBACKEND_HOME"; - /** Field description */ - static final String DIRECTORY_PROPERTY = "scm-backend.home"; - /** Field description */ private static BaseDirectory instance; diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationNameComparator.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationNameComparator.java index 9c464bbb01..95f33a2e0e 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationNameComparator.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationNameComparator.java @@ -46,7 +46,7 @@ import java.util.Comparator; * @author Sebastian Sdorra */ public class PluginInformationNameComparator - implements Comparator + implements Comparator { /** Field description */ diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationVersionComparator.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationVersionComparator.java index 5d3c4b0506..75ace83a9b 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationVersionComparator.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationVersionComparator.java @@ -46,7 +46,7 @@ import java.util.Comparator; * @author Sebastian Sdorra */ public class PluginInformationVersionComparator - implements Comparator + implements Comparator { /** Field description */ @@ -74,7 +74,7 @@ public class PluginInformationVersionComparator if (Util.isNotEmpty(v1) && Util.isNotEmpty(v2)) { if (PluginVersion.createVersion(v1).isNewer( - PluginVersion.createVersion(v2))) + PluginVersion.createVersion(v2))) { result = -1; } diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginUtil.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginUtil.java index b536f8f9eb..098577f9dc 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginUtil.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginUtil.java @@ -60,7 +60,7 @@ public class PluginUtil * @return */ public static List filterSameVersions( - List plugins) + List plugins) { List filteredPlugins = new ArrayList(); @@ -87,7 +87,7 @@ public class PluginUtil * @return */ public static List filterSnapshots( - List allVersions) + List allVersions) { List filtered = new ArrayList(); @@ -137,7 +137,7 @@ public class PluginUtil * @return */ public static List getFilteredPluginVersions( - PluginBackend backend, String groupId, String artifactId) + PluginBackend backend, String groupId, String artifactId) { List pluginVersions = PluginUtil.getPluginVersions(backend, groupId, artifactId); @@ -145,7 +145,7 @@ public class PluginUtil if (Util.isNotEmpty(pluginVersions)) { Collections.sort(pluginVersions, - PluginInformationNameComparator.INSTANCE); + PluginInformationNameComparator.INSTANCE); pluginVersions = PluginUtil.filterSameVersions(pluginVersions); } @@ -163,7 +163,7 @@ public class PluginUtil * @return */ public static PluginInformation getLatestPluginVersion(PluginBackend backend, - String groupId, String artifactId) + String groupId, String artifactId) { return getFilteredPluginVersions(backend, groupId, artifactId).get(0); } @@ -180,7 +180,7 @@ public class PluginUtil * @return */ public static List getPluginVersions( - PluginBackend backend, final String groupId, final String artifactId) + PluginBackend backend, final String groupId, final String artifactId) { List pluginVersions = backend.getPlugins(new PluginFilter() @@ -189,7 +189,7 @@ public class PluginUtil public boolean accept(PluginInformation plugin) { return groupId.equals(plugin.getGroupId()) - && artifactId.equals(plugin.getArtifactId()); + && artifactId.equals(plugin.getArtifactId()); } }); diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/RedirectFilter.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/RedirectFilter.java index c8deb768f2..d350da08e6 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/RedirectFilter.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/RedirectFilter.java @@ -34,6 +34,7 @@ package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- import com.google.inject.Singleton; + import sonia.scm.web.filter.HttpFilter; //~--- JDK imports ------------------------------------------------------------ @@ -52,9 +53,12 @@ import javax.servlet.http.HttpServletResponse; @Singleton public class RedirectFilter extends HttpFilter { - + + /** Field description */ private static final String STARTPAGE = "/page/index.html"; + //~--- methods -------------------------------------------------------------- + /** * Method description * diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/Roles.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/Roles.java index fe37f8b681..5f45cc9869 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/Roles.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/Roles.java @@ -26,6 +26,9 @@ * http://bitbucket.org/sdorra/scm-manager * */ + + + package sonia.scm.plugin; /** @@ -34,5 +37,7 @@ package sonia.scm.plugin; */ public class Roles { + + /** Field description */ public static final String ADMIN = "admin"; } 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 3e09ffbced..cf0b6f6aa2 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 @@ -41,15 +41,15 @@ import com.google.inject.servlet.ServletModule; import net.sf.ehcache.CacheManager; import sonia.scm.ConfigurationException; -import sonia.scm.plugin.rest.PluginResource; -import sonia.scm.plugin.rest.url.BitbucketUrlBuilder; -import sonia.scm.plugin.rest.url.GithubUrlBuilder; -import sonia.scm.plugin.rest.url.UrlBuilder; -import sonia.scm.plugin.rest.url.UrlBuilderFactory; +import sonia.scm.plugin.rest.api.PluginResource; import sonia.scm.plugin.scanner.DefaultPluginScannerFactory; import sonia.scm.plugin.scanner.PluginScannerFactory; import sonia.scm.plugin.scanner.PluginScannerScheduler; import sonia.scm.plugin.scanner.TimerPluginScannerScheduler; +import sonia.scm.plugin.url.BitbucketUrlBuilder; +import sonia.scm.plugin.url.GithubUrlBuilder; +import sonia.scm.plugin.url.UrlBuilder; +import sonia.scm.plugin.url.UrlBuilderFactory; import sonia.scm.web.proxy.ProxyConfigurationProvider; import sonia.scm.web.proxy.ProxyServlet; diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/FreemarkerTemplateProvider.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/FreemarkerTemplateProvider.java index 9c8e74b908..93e1e2084c 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/FreemarkerTemplateProvider.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/FreemarkerTemplateProvider.java @@ -87,7 +87,7 @@ public class FreemarkerTemplateProvider implements ViewProcessor { configuration = new Configuration(); configuration.setServletContextForTemplateLoading(servletContext, - DIRECTORY_TEMPLATES); + DIRECTORY_TEMPLATES); } //~--- methods -------------------------------------------------------------- @@ -124,7 +124,7 @@ public class FreemarkerTemplateProvider implements ViewProcessor */ @Override public void writeTo(String resolvedPath, Viewable viewable, OutputStream out) - throws IOException + throws IOException { if (logger.isDebugEnabled()) { diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginInformationComparator.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginInformationComparator.java index f565746c41..3f2d72d42b 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginInformationComparator.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginInformationComparator.java @@ -47,7 +47,7 @@ import java.util.Comparator; * @author Sebastian Sdorra */ public class PluginInformationComparator - implements Comparator + implements Comparator { /** Field description */ diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java index d4b3373646..e7af14dfd3 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ViewableResource.java @@ -59,7 +59,7 @@ public class ViewableResource * @param configuration */ public ViewableResource(ServletContext context, - BackendConfiguration configuration) + BackendConfiguration configuration) { this.contextPath = context.getContextPath(); this.configuration = configuration; diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/AdminResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/admin/AdminResource.java similarity index 97% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/AdminResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/admin/AdminResource.java index 8be0a12453..c8e893ebde 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/AdminResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/admin/AdminResource.java @@ -29,13 +29,14 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.admin; //~--- non-JDK imports -------------------------------------------------------- import com.google.inject.Inject; import sonia.scm.plugin.BackendConfiguration; +import sonia.scm.plugin.rest.ViewableResource; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DefaultPluginFilter.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/DefaultPluginFilter.java similarity index 91% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DefaultPluginFilter.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/DefaultPluginFilter.java index f304d4d064..e2b05079cc 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DefaultPluginFilter.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/DefaultPluginFilter.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.api; //~--- non-JDK imports -------------------------------------------------------- @@ -61,7 +61,7 @@ public class DefaultPluginFilter implements PluginFilter * @param snapshot */ public DefaultPluginFilter(String version, String os, String arch, - boolean snapshot) + boolean snapshot) { this.version = version; this.os = os; @@ -84,9 +84,10 @@ public class DefaultPluginFilter implements PluginFilter { PluginCondition condition = plugin.getCondition(); - return (snapshot ||!plugin.getVersion().toUpperCase().contains( - VERSION_SNAPSHOT)) && ((condition != null) && condition.isSupported( - version, os, arch) || (condition == null)); + return (snapshot + ||!plugin.getVersion().toUpperCase().contains( + VERSION_SNAPSHOT)) && ((condition != null) + && condition.isSupported(version, os, arch) || (condition == null)); } //~--- fields --------------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/PluginResource.java similarity index 92% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/PluginResource.java index 4ee7d3c373..01ad3aea12 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/PluginResource.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.api; //~--- non-JDK imports -------------------------------------------------------- @@ -51,6 +51,7 @@ import sonia.scm.plugin.PluginBackendListener; import sonia.scm.plugin.PluginCenter; import sonia.scm.plugin.PluginInformation; import sonia.scm.plugin.PluginVersion; +import sonia.scm.plugin.rest.PluginInformationComparator; //~--- JDK imports ------------------------------------------------------------ @@ -97,8 +98,7 @@ public class PluginResource implements PluginBackendListener */ @Inject public PluginResource(PluginBackend backend, - BackendConfiguration configuration, - CacheManager cacheManager) + BackendConfiguration configuration, CacheManager cacheManager) { this.backend = backend; this.configuration = configuration; @@ -143,15 +143,14 @@ public class PluginResource implements PluginBackendListener @GET @Produces(MediaType.APPLICATION_XML) public Response getPlugins(@PathParam("version") String version, - @QueryParam("os") String os, - @QueryParam("arch") String arch, - @DefaultValue("false") + @QueryParam("os") String os, @QueryParam("arch") String arch, + @DefaultValue("false") @QueryParam("snapshot") boolean snapshot) { if (logger.isDebugEnabled()) { logger.debug("load plugins for version {}, include snapshots: {}", - version, Boolean.toString(snapshot)); + version, Boolean.toString(snapshot)); } PluginCenter pc = null; @@ -201,7 +200,7 @@ public class PluginResource implements PluginBackendListener * @return */ private String createCacheKey(String version, String os, String arch, - boolean snapshot) + boolean snapshot) { StringBuilder key = new StringBuilder(version); @@ -222,7 +221,7 @@ public class PluginResource implements PluginBackendListener * @return */ private Set getNewestPlugins( - List plugins) + List plugins) { Collections.sort(plugins, PluginInformationComparator.INSTANCE); @@ -278,10 +277,10 @@ public class PluginResource implements PluginBackendListener * @return */ private boolean isSamePlugin(PluginInformation plugin, - PluginInformation otherPlugin) + PluginInformation otherPlugin) { return plugin.getGroupId().equals(otherPlugin.getGroupId()) - && plugin.getArtifactId().equals(otherPlugin.getArtifactId()); + && plugin.getArtifactId().equals(otherPlugin.getArtifactId()); } //~--- fields --------------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ErrorResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/error/ErrorResource.java similarity index 97% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ErrorResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/error/ErrorResource.java index 0d415e8323..e441a2768b 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ErrorResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/error/ErrorResource.java @@ -29,13 +29,14 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.error; //~--- non-JDK imports -------------------------------------------------------- import com.google.inject.Inject; import sonia.scm.plugin.BackendConfiguration; +import sonia.scm.plugin.rest.ViewableResource; //~--- JDK imports ------------------------------------------------------------ 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/page/DetailResource.java similarity index 90% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/DetailResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/DetailResource.java index a2e7fe7567..de7c1eada7 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/page/DetailResource.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.page; //~--- non-JDK imports -------------------------------------------------------- @@ -48,8 +48,9 @@ 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.UrlBuilder; -import sonia.scm.plugin.rest.url.UrlBuilderFactory; +import sonia.scm.plugin.rest.CachedViewableResource; +import sonia.scm.plugin.url.UrlBuilder; +import sonia.scm.plugin.url.UrlBuilderFactory; import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ @@ -103,8 +104,8 @@ public class DetailResource extends CachedViewableResource */ @Inject public DetailResource(ServletContext context, PluginBackend backend, - BackendConfiguration configuration, - UrlBuilderFactory urlFactory, CacheManager cacheManager) + BackendConfiguration configuration, UrlBuilderFactory urlFactory, + CacheManager cacheManager) { super(context, backend, configuration, cacheManager, CACHE); this.backend = backend; @@ -125,8 +126,7 @@ public class DetailResource extends CachedViewableResource */ @GET public Viewable getPluginDetails(@PathParam("groupId") String groupId, - @PathParam("artifactId") String artifactId, - @DefaultValue("false") + @PathParam("artifactId") String artifactId, @DefaultValue("false") @QueryParam("snapshot") boolean snapshot) { String cacheKey = createCacheKey(groupId, artifactId, snapshot); @@ -160,7 +160,7 @@ public class DetailResource extends CachedViewableResource vars.put("latest", PluginUtil.prepareForView(latest)); vars.put("versions", detailList); - viewable = new Viewable("/detail", vars); + viewable = new Viewable("/page/detail", vars); putToCache(cacheKey, viewable); } else if (logger.isDebugEnabled()) @@ -184,10 +184,10 @@ public class DetailResource extends CachedViewableResource * @return */ private String createCacheKey(String groupId, String artifactId, - boolean snapshot) + boolean snapshot) { return new StringBuilder(Util.nonNull(groupId)).append( - Util.nonNull(artifactId)).append(Boolean.toString(snapshot)).toString(); + Util.nonNull(artifactId)).append(Boolean.toString(snapshot)).toString(); } /** @@ -200,12 +200,12 @@ public class DetailResource extends CachedViewableResource * @return */ private List createDetailList(PluginInformation latest, - List pluginVersions) + List pluginVersions) { List detailList = new ArrayList(); Collections.sort(pluginVersions, - PluginInformationVersionComparator.INSTANCE); + PluginInformationVersionComparator.INSTANCE); Iterator pluginIterator = pluginVersions.iterator(); UrlBuilder urlBuilder = urlFactory.createCompareUrlBuilder(latest); diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/LoginResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/LoginResource.java similarity index 95% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/LoginResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/LoginResource.java index 00c4897814..352619f16f 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/LoginResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/LoginResource.java @@ -29,13 +29,14 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.page; //~--- non-JDK imports -------------------------------------------------------- import com.google.inject.Inject; import sonia.scm.plugin.BackendConfiguration; +import sonia.scm.plugin.rest.ViewableResource; //~--- JDK imports ------------------------------------------------------------ @@ -60,7 +61,7 @@ public class LoginResource extends ViewableResource { /** Field description */ - private static final String PAGE_LOGIN = "/login"; + private static final String PAGE_LOGIN = "/page/login"; //~--- constructors --------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/OverviewResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/OverviewResource.java similarity index 96% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/OverviewResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/OverviewResource.java index a0fef91f44..7537cf1a26 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/OverviewResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/OverviewResource.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.page; //~--- non-JDK imports -------------------------------------------------------- @@ -43,6 +43,8 @@ import sonia.scm.plugin.CategoryNameComaparator; import sonia.scm.plugin.PluginBackend; import sonia.scm.plugin.PluginInformation; import sonia.scm.plugin.PluginUtil; +import sonia.scm.plugin.rest.PluginInformationComparator; +import sonia.scm.plugin.rest.ViewableResource; import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ @@ -106,7 +108,7 @@ public class OverviewResource extends ViewableResource vars.put("categories", categories); - return new Viewable("/index", vars); + return new Viewable("/page/index", vars); } /** diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginDetailWrapper.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/PluginDetailWrapper.java similarity index 98% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginDetailWrapper.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/PluginDetailWrapper.java index 54e062e392..b2c286d577 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginDetailWrapper.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/PluginDetailWrapper.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.page; //~--- non-JDK imports -------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ScreenshotResource.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/ScreenshotResource.java similarity index 97% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ScreenshotResource.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/ScreenshotResource.java index 896fe24728..712ea105c2 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/ScreenshotResource.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/page/ScreenshotResource.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest; +package sonia.scm.plugin.rest.page; //~--- non-JDK imports -------------------------------------------------------- @@ -39,6 +39,7 @@ import com.google.inject.Inject; import org.imgscalr.Scalr; +import sonia.scm.plugin.BaseDirectory; import sonia.scm.plugin.PluginBackend; import sonia.scm.plugin.PluginInformation; import sonia.scm.plugin.PluginUtil; @@ -66,7 +67,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import sonia.scm.plugin.BaseDirectory; /** * @@ -125,11 +125,9 @@ public class ScreenshotResource */ @GET @Produces("image/jpeg") - public Response getScreenshot( - @PathParam("groupId") String groupId, + public Response getScreenshot(@PathParam("groupId") String groupId, @PathParam("artifactId") String artifactId, - @PathParam("number") int number, - @PathParam("size") String size) + @PathParam("number") int number, @PathParam("size") String size) throws IOException { PluginInformation plugin = PluginUtil.getLatestPluginVersion(backend, diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerRunnable.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerRunnable.java index cbefb8e71f..7c6b7bc96a 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerRunnable.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerRunnable.java @@ -57,7 +57,7 @@ public class PluginScannerRunnable implements Runnable * @param directory */ public PluginScannerRunnable(PluginBackend backend, - PluginScanner pluginScanner, File directory) + PluginScanner pluginScanner, File directory) { this.backend = backend; this.pluginScanner = pluginScanner; diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerTimerTask.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerTimerTask.java index 119ebffbd8..146352d40e 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerTimerTask.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/PluginScannerTimerTask.java @@ -69,8 +69,7 @@ public class PluginScannerTimerTask extends TimerTask * @param scannerFactory */ public PluginScannerTimerTask(PluginBackend backend, - BackendConfiguration configuration, - PluginScannerFactory scannerFactory) + BackendConfiguration configuration, PluginScannerFactory scannerFactory) { this.backend = backend; this.configuration = configuration; @@ -103,7 +102,7 @@ public class PluginScannerTimerTask extends TimerTask if (configuration.isMultithreaded()) { new Thread(new PluginScannerRunnable(backend, scanner, - directory)).start(); + directory)).start(); } else { diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/TimerPluginScannerScheduler.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/TimerPluginScannerScheduler.java index cd4c02d5d8..82d1e502de 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/TimerPluginScannerScheduler.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/scanner/TimerPluginScannerScheduler.java @@ -74,8 +74,7 @@ public class TimerPluginScannerScheduler implements PluginScannerScheduler */ @Inject public TimerPluginScannerScheduler(PluginBackend backend, - BackendConfiguration configuration, - PluginScannerFactory scannerFactory) + BackendConfiguration configuration, PluginScannerFactory scannerFactory) { this.backend = backend; this.configuration = configuration; @@ -105,7 +104,7 @@ public class TimerPluginScannerScheduler implements PluginScannerScheduler if (logger.isInfoEnabled()) { logger.info("start scanner task with an interval of {}", - Util.convertTime(configuration.getScannInterval())); + Util.convertTime(configuration.getScannInterval())); } PluginScannerTimerTask task = new PluginScannerTimerTask(backend, diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/AbstractUrlBuilder.java similarity index 92% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/url/AbstractUrlBuilder.java index 3cd30be71e..e15e2a980a 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/AbstractUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/AbstractUrlBuilder.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest.url; +package sonia.scm.plugin.url; //~--- non-JDK imports -------------------------------------------------------- @@ -92,11 +92,10 @@ public abstract class AbstractUrlBuilder implements UrlBuilder */ @Override public String createCompareUrl(PluginInformation latest, - PluginInformation plugin, - PluginInformation other) + PluginInformation plugin, PluginInformation other) { return createCompareUrl(latest.getUrl(), plugin.getVersion(), - other.getVersion()); + other.getVersion()); } /** @@ -110,7 +109,7 @@ public abstract class AbstractUrlBuilder implements UrlBuilder * @return */ public String createCompareUrl(String urlString, String version, - String otherVersion) + String otherVersion) { String result = null; @@ -128,7 +127,7 @@ public abstract class AbstractUrlBuilder implements UrlBuilder if (parts.length >= 2) { result = MessageFormat.format(getUrlPattern(), parts[0], parts[1], - version, otherVersion); + version, otherVersion); } } } diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/BitbucketUrlBuilder.java similarity index 98% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/url/BitbucketUrlBuilder.java index d849ff1668..3b2132230e 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/BitbucketUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/BitbucketUrlBuilder.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest.url; +package sonia.scm.plugin.url; /** * diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubUrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/GithubUrlBuilder.java similarity index 98% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubUrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/url/GithubUrlBuilder.java index dfeeeb2ac9..2a77263e22 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/GithubUrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/GithubUrlBuilder.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest.url; +package sonia.scm.plugin.url; /** * diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilder.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/UrlBuilder.java similarity index 93% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilder.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/url/UrlBuilder.java index 43eac2126e..1109625915 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilder.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/UrlBuilder.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest.url; +package sonia.scm.plugin.url; //~--- non-JDK imports -------------------------------------------------------- @@ -55,8 +55,7 @@ public interface UrlBuilder * @return */ public String createCompareUrl(PluginInformation latest, - PluginInformation plugin, - PluginInformation other); + PluginInformation plugin, PluginInformation other); //~--- get methods ---------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilderFactory.java b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/UrlBuilderFactory.java similarity index 98% rename from scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilderFactory.java rename to scm-plugin-backend/src/main/java/sonia/scm/plugin/url/UrlBuilderFactory.java index b1d2e02758..1f2efa960c 100644 --- a/scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/url/UrlBuilderFactory.java +++ b/scm-plugin-backend/src/main/java/sonia/scm/plugin/url/UrlBuilderFactory.java @@ -31,7 +31,7 @@ -package sonia.scm.plugin.rest.url; +package sonia.scm.plugin.url; //~--- non-JDK imports -------------------------------------------------------- diff --git a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/detail.html b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/detail.html similarity index 97% rename from scm-plugin-backend/src/main/webapp/WEB-INF/ftl/detail.html rename to scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/detail.html index 841d574a79..74f63b494b 100644 --- a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/detail.html +++ b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/detail.html @@ -1,4 +1,4 @@ -<#include "template/header.html"> +<#include "../template/header.html">

${latest.description}

@@ -133,4 +133,4 @@ }); -<#include "template/footer.html"> \ No newline at end of file +<#include "../template/footer.html"> \ No newline at end of file diff --git a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/index.html b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/index.html similarity index 89% rename from scm-plugin-backend/src/main/webapp/WEB-INF/ftl/index.html rename to scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/index.html index b6c078530b..50ba3625de 100644 --- a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/index.html +++ b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/index.html @@ -1,4 +1,4 @@ -<#include "template/header.html"> +<#include "../template/header.html">
<#list categories as category> @@ -25,4 +25,4 @@ }); -<#include "template/footer.html"> \ No newline at end of file +<#include "../template/footer.html"> \ No newline at end of file diff --git a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/login.html b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/login.html similarity index 85% rename from scm-plugin-backend/src/main/webapp/WEB-INF/ftl/login.html rename to scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/login.html index a3524202d0..a5842ab7cf 100644 --- a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/login.html +++ b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/page/login.html @@ -1,4 +1,4 @@ -<#include "template/header.html"> +<#include "../template/header.html">
@@ -25,4 +25,4 @@
-<#include "template/footer.html"> \ No newline at end of file +<#include "../template/footer.html"> \ No newline at end of file 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 6e90943e6e..3e10086fe6 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 @@ -35,6 +35,7 @@ package sonia.scm.plugin.rest.url; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.plugin.url.BitbucketUrlBuilder; import org.junit.Test; import static org.junit.Assert.*; 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 2740b1da20..be4eff2c49 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 @@ -35,6 +35,7 @@ package sonia.scm.plugin.rest.url; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.plugin.url.GithubUrlBuilder; import org.junit.Test; import static org.junit.Assert.*;