mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 23:45:44 +01:00
Cleanup names, dead code and logging
This commit is contained in:
@@ -13,7 +13,7 @@ import java.util.Arrays;
|
|||||||
* builder for each method.
|
* builder for each method.
|
||||||
*
|
*
|
||||||
* <pre>
|
* <pre>
|
||||||
* LinkBuilder builder = new LinkBuilder(uriInfo, MainResource.class, SubResource.class);
|
* LinkBuilder builder = new LinkBuilder(pathInfo, MainResource.class, SubResource.class);
|
||||||
* Link link = builder
|
* Link link = builder
|
||||||
* .method("sub")
|
* .method("sub")
|
||||||
* .parameters("param")
|
* .parameters("param")
|
||||||
@@ -24,16 +24,16 @@ import java.util.Arrays;
|
|||||||
*/
|
*/
|
||||||
@SuppressWarnings("WeakerAccess") // Non-public will result in IllegalAccessError for plugins
|
@SuppressWarnings("WeakerAccess") // Non-public will result in IllegalAccessError for plugins
|
||||||
public class LinkBuilder {
|
public class LinkBuilder {
|
||||||
private final ScmPathInfo uriInfo;
|
private final ScmPathInfo pathInfo;
|
||||||
private final Class[] classes;
|
private final Class[] classes;
|
||||||
private final ImmutableList<Call> calls;
|
private final ImmutableList<Call> calls;
|
||||||
|
|
||||||
public LinkBuilder(ScmPathInfo uriInfo, Class... classes) {
|
public LinkBuilder(ScmPathInfo pathInfo, Class... classes) {
|
||||||
this(uriInfo, classes, ImmutableList.of());
|
this(pathInfo, classes, ImmutableList.of());
|
||||||
}
|
}
|
||||||
|
|
||||||
private LinkBuilder(ScmPathInfo uriInfo, Class[] classes, ImmutableList<Call> calls) {
|
private LinkBuilder(ScmPathInfo pathInfo, Class[] classes, ImmutableList<Call> calls) {
|
||||||
this.uriInfo = uriInfo;
|
this.pathInfo = pathInfo;
|
||||||
this.classes = classes;
|
this.classes = classes;
|
||||||
this.calls = calls;
|
this.calls = calls;
|
||||||
}
|
}
|
||||||
@@ -50,7 +50,7 @@ public class LinkBuilder {
|
|||||||
throw new IllegalStateException("not enough methods for all classes");
|
throw new IllegalStateException("not enough methods for all classes");
|
||||||
}
|
}
|
||||||
|
|
||||||
URI baseUri = uriInfo.getApiRestUri();
|
URI baseUri = pathInfo.getApiRestUri();
|
||||||
URI relativeUri = createRelativeUri();
|
URI relativeUri = createRelativeUri();
|
||||||
return baseUri.resolve(relativeUri);
|
return baseUri.resolve(relativeUri);
|
||||||
}
|
}
|
||||||
@@ -60,7 +60,7 @@ public class LinkBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private LinkBuilder add(String method, String[] parameters) {
|
private LinkBuilder add(String method, String[] parameters) {
|
||||||
return new LinkBuilder(uriInfo, classes, appendNewCall(method, parameters));
|
return new LinkBuilder(pathInfo, classes, appendNewCall(method, parameters));
|
||||||
}
|
}
|
||||||
|
|
||||||
private ImmutableList<Call> appendNewCall(String method, String[] parameters) {
|
private ImmutableList<Call> appendNewCall(String method, String[] parameters) {
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public abstract class InitializingHttpScmProtocolWrapper implements ScmProtocolP
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getPathFromConfiguration() {
|
private String getPathFromConfiguration() {
|
||||||
logger.debug("using base path from configuration: " + scmConfiguration.getBaseUrl());
|
logger.debug("using base path from configuration: {}", scmConfiguration.getBaseUrl());
|
||||||
return scmConfiguration.getBaseUrl();
|
return scmConfiguration.getBaseUrl();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ import sonia.scm.repository.Repository;
|
|||||||
import sonia.scm.repository.RepositoryManager;
|
import sonia.scm.repository.RepositoryManager;
|
||||||
import sonia.scm.repository.RepositoryTypePredicate;
|
import sonia.scm.repository.RepositoryTypePredicate;
|
||||||
import sonia.scm.template.Viewable;
|
import sonia.scm.template.Viewable;
|
||||||
import sonia.scm.util.HttpUtil;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.ws.rs.GET;
|
import javax.ws.rs.GET;
|
||||||
@@ -98,13 +97,12 @@ public class RepositoryRootResource
|
|||||||
@Produces(MediaType.TEXT_HTML)
|
@Produces(MediaType.TEXT_HTML)
|
||||||
public Viewable renderRepositoriesRoot(@Context HttpServletRequest request, @PathParam("type") final String type)
|
public Viewable renderRepositoriesRoot(@Context HttpServletRequest request, @PathParam("type") final String type)
|
||||||
{
|
{
|
||||||
String baseUrl = HttpUtil.getCompleteUrl(request);
|
|
||||||
//J-
|
//J-
|
||||||
Collection<RepositoryTemplateElement> unsortedRepositories =
|
Collection<RepositoryTemplateElement> unsortedRepositories =
|
||||||
Collections2.transform(
|
Collections2.transform(
|
||||||
Collections2.filter(
|
Collections2.filter(
|
||||||
repositoryManager.getAll(), new RepositoryTypePredicate(type))
|
repositoryManager.getAll(), new RepositoryTypePredicate(type))
|
||||||
, new RepositoryTransformFunction(baseUrl)
|
, new RepositoryTransformFunction()
|
||||||
);
|
);
|
||||||
|
|
||||||
List<RepositoryTemplateElement> repositories = Ordering.from(
|
List<RepositoryTemplateElement> repositories = Ordering.from(
|
||||||
@@ -130,17 +128,9 @@ public class RepositoryRootResource
|
|||||||
public static class RepositoryTemplateElement
|
public static class RepositoryTemplateElement
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
public RepositoryTemplateElement(Repository repository)
|
||||||
* Constructs ...
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* @param repository
|
|
||||||
* @param baseUrl
|
|
||||||
*/
|
|
||||||
public RepositoryTemplateElement(Repository repository, String baseUrl)
|
|
||||||
{
|
{
|
||||||
this.repository = repository;
|
this.repository = repository;
|
||||||
this.baseUrl = baseUrl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//~--- get methods --------------------------------------------------------
|
//~--- get methods --------------------------------------------------------
|
||||||
@@ -169,9 +159,6 @@ public class RepositoryRootResource
|
|||||||
|
|
||||||
//~--- fields -------------------------------------------------------------
|
//~--- fields -------------------------------------------------------------
|
||||||
|
|
||||||
/** Field description */
|
|
||||||
private String baseUrl;
|
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
private Repository repository;
|
private Repository repository;
|
||||||
|
|
||||||
@@ -217,31 +204,10 @@ public class RepositoryRootResource
|
|||||||
private static class RepositoryTransformFunction
|
private static class RepositoryTransformFunction
|
||||||
implements Function<Repository, RepositoryTemplateElement>
|
implements Function<Repository, RepositoryTemplateElement>
|
||||||
{
|
{
|
||||||
|
|
||||||
public RepositoryTransformFunction(String baseUrl)
|
|
||||||
{
|
|
||||||
this.baseUrl = baseUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
//~--- methods ------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Method description
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* @param repository
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public RepositoryTemplateElement apply(Repository repository)
|
public RepositoryTemplateElement apply(Repository repository)
|
||||||
{
|
{
|
||||||
return new RepositoryTemplateElement(repository, baseUrl);
|
return new RepositoryTemplateElement(repository);
|
||||||
}
|
}
|
||||||
|
|
||||||
//~--- fields -------------------------------------------------------------
|
|
||||||
|
|
||||||
/** Field description */
|
|
||||||
private String baseUrl;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ class ResourceLinks {
|
|||||||
static class GroupLinks {
|
static class GroupLinks {
|
||||||
private final LinkBuilder groupLinkBuilder;
|
private final LinkBuilder groupLinkBuilder;
|
||||||
|
|
||||||
GroupLinks(ScmPathInfo uriInfo) {
|
GroupLinks(ScmPathInfo pathInfo) {
|
||||||
groupLinkBuilder = new LinkBuilder(uriInfo, GroupRootResource.class, GroupResource.class);
|
groupLinkBuilder = new LinkBuilder(pathInfo, GroupRootResource.class, GroupResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String name) {
|
String self(String name) {
|
||||||
@@ -50,8 +50,8 @@ class ResourceLinks {
|
|||||||
static class GroupCollectionLinks {
|
static class GroupCollectionLinks {
|
||||||
private final LinkBuilder collectionLinkBuilder;
|
private final LinkBuilder collectionLinkBuilder;
|
||||||
|
|
||||||
GroupCollectionLinks(ScmPathInfo uriInfo) {
|
GroupCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
collectionLinkBuilder = new LinkBuilder(uriInfo, GroupRootResource.class, GroupCollectionResource.class);
|
collectionLinkBuilder = new LinkBuilder(pathInfo, GroupRootResource.class, GroupCollectionResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self() {
|
String self() {
|
||||||
@@ -70,8 +70,8 @@ class ResourceLinks {
|
|||||||
static class UserLinks {
|
static class UserLinks {
|
||||||
private final LinkBuilder userLinkBuilder;
|
private final LinkBuilder userLinkBuilder;
|
||||||
|
|
||||||
UserLinks(ScmPathInfo uriInfo) {
|
UserLinks(ScmPathInfo pathInfo) {
|
||||||
userLinkBuilder = new LinkBuilder(uriInfo, UserRootResource.class, UserResource.class);
|
userLinkBuilder = new LinkBuilder(pathInfo, UserRootResource.class, UserResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String name) {
|
String self(String name) {
|
||||||
@@ -94,8 +94,8 @@ class ResourceLinks {
|
|||||||
static class UserCollectionLinks {
|
static class UserCollectionLinks {
|
||||||
private final LinkBuilder collectionLinkBuilder;
|
private final LinkBuilder collectionLinkBuilder;
|
||||||
|
|
||||||
UserCollectionLinks(ScmPathInfo uriInfo) {
|
UserCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
collectionLinkBuilder = new LinkBuilder(uriInfo, UserRootResource.class, UserCollectionResource.class);
|
collectionLinkBuilder = new LinkBuilder(pathInfo, UserRootResource.class, UserCollectionResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self() {
|
String self() {
|
||||||
@@ -114,8 +114,8 @@ class ResourceLinks {
|
|||||||
static class ConfigLinks {
|
static class ConfigLinks {
|
||||||
private final LinkBuilder configLinkBuilder;
|
private final LinkBuilder configLinkBuilder;
|
||||||
|
|
||||||
ConfigLinks(ScmPathInfo uriInfo) {
|
ConfigLinks(ScmPathInfo pathInfo) {
|
||||||
configLinkBuilder = new LinkBuilder(uriInfo, ConfigResource.class);
|
configLinkBuilder = new LinkBuilder(pathInfo, ConfigResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self() {
|
String self() {
|
||||||
@@ -133,11 +133,9 @@ class ResourceLinks {
|
|||||||
|
|
||||||
static class RepositoryLinks {
|
static class RepositoryLinks {
|
||||||
private final LinkBuilder repositoryLinkBuilder;
|
private final LinkBuilder repositoryLinkBuilder;
|
||||||
private final ScmPathInfo uriInfo;
|
|
||||||
|
|
||||||
RepositoryLinks(ScmPathInfo uriInfo) {
|
RepositoryLinks(ScmPathInfo pathInfo) {
|
||||||
repositoryLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class);
|
repositoryLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class);
|
||||||
this.uriInfo = uriInfo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name) {
|
String self(String namespace, String name) {
|
||||||
@@ -160,8 +158,8 @@ class ResourceLinks {
|
|||||||
static class RepositoryCollectionLinks {
|
static class RepositoryCollectionLinks {
|
||||||
private final LinkBuilder collectionLinkBuilder;
|
private final LinkBuilder collectionLinkBuilder;
|
||||||
|
|
||||||
RepositoryCollectionLinks(ScmPathInfo uriInfo) {
|
RepositoryCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
collectionLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryCollectionResource.class);
|
collectionLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryCollectionResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self() {
|
String self() {
|
||||||
@@ -180,8 +178,8 @@ class ResourceLinks {
|
|||||||
static class RepositoryTypeLinks {
|
static class RepositoryTypeLinks {
|
||||||
private final LinkBuilder repositoryTypeLinkBuilder;
|
private final LinkBuilder repositoryTypeLinkBuilder;
|
||||||
|
|
||||||
RepositoryTypeLinks(ScmPathInfo uriInfo) {
|
RepositoryTypeLinks(ScmPathInfo pathInfo) {
|
||||||
repositoryTypeLinkBuilder = new LinkBuilder(uriInfo, RepositoryTypeRootResource.class, RepositoryTypeResource.class);
|
repositoryTypeLinkBuilder = new LinkBuilder(pathInfo, RepositoryTypeRootResource.class, RepositoryTypeResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String name) {
|
String self(String name) {
|
||||||
@@ -196,8 +194,8 @@ class ResourceLinks {
|
|||||||
static class RepositoryTypeCollectionLinks {
|
static class RepositoryTypeCollectionLinks {
|
||||||
private final LinkBuilder collectionLinkBuilder;
|
private final LinkBuilder collectionLinkBuilder;
|
||||||
|
|
||||||
RepositoryTypeCollectionLinks(ScmPathInfo uriInfo) {
|
RepositoryTypeCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
collectionLinkBuilder = new LinkBuilder(uriInfo, RepositoryTypeRootResource.class, RepositoryTypeCollectionResource.class);
|
collectionLinkBuilder = new LinkBuilder(pathInfo, RepositoryTypeRootResource.class, RepositoryTypeCollectionResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self() {
|
String self() {
|
||||||
@@ -213,8 +211,8 @@ class ResourceLinks {
|
|||||||
static class TagCollectionLinks {
|
static class TagCollectionLinks {
|
||||||
private final LinkBuilder tagLinkBuilder;
|
private final LinkBuilder tagLinkBuilder;
|
||||||
|
|
||||||
TagCollectionLinks(ScmPathInfo uriInfo) {
|
TagCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
tagLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, TagRootResource.class);
|
tagLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, TagRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name, String tagName) {
|
String self(String namespace, String name, String tagName) {
|
||||||
@@ -233,8 +231,8 @@ class ResourceLinks {
|
|||||||
static class DiffLinks {
|
static class DiffLinks {
|
||||||
private final LinkBuilder diffLinkBuilder;
|
private final LinkBuilder diffLinkBuilder;
|
||||||
|
|
||||||
DiffLinks(ScmPathInfo uriInfo) {
|
DiffLinks(ScmPathInfo pathInfo) {
|
||||||
diffLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, DiffRootResource.class);
|
diffLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, DiffRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name, String id) {
|
String self(String namespace, String name, String id) {
|
||||||
@@ -253,8 +251,8 @@ class ResourceLinks {
|
|||||||
static class BranchLinks {
|
static class BranchLinks {
|
||||||
private final LinkBuilder branchLinkBuilder;
|
private final LinkBuilder branchLinkBuilder;
|
||||||
|
|
||||||
BranchLinks(ScmPathInfo uriInfo) {
|
BranchLinks(ScmPathInfo pathInfo) {
|
||||||
branchLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, BranchRootResource.class);
|
branchLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, BranchRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(NamespaceAndName namespaceAndName, String branch) {
|
String self(NamespaceAndName namespaceAndName, String branch) {
|
||||||
@@ -273,8 +271,8 @@ class ResourceLinks {
|
|||||||
static class BranchCollectionLinks {
|
static class BranchCollectionLinks {
|
||||||
private final LinkBuilder branchLinkBuilder;
|
private final LinkBuilder branchLinkBuilder;
|
||||||
|
|
||||||
BranchCollectionLinks(ScmPathInfo uriInfo) {
|
BranchCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
branchLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, BranchRootResource.class);
|
branchLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, BranchRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name) {
|
String self(String namespace, String name) {
|
||||||
@@ -289,8 +287,8 @@ class ResourceLinks {
|
|||||||
static class ChangesetLinks {
|
static class ChangesetLinks {
|
||||||
private final LinkBuilder changesetLinkBuilder;
|
private final LinkBuilder changesetLinkBuilder;
|
||||||
|
|
||||||
ChangesetLinks(ScmPathInfo uriInfo) {
|
ChangesetLinks(ScmPathInfo pathInfo) {
|
||||||
changesetLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, ChangesetRootResource.class);
|
changesetLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, ChangesetRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name, String changesetId) {
|
String self(String namespace, String name, String changesetId) {
|
||||||
@@ -313,8 +311,8 @@ class ResourceLinks {
|
|||||||
static class ModificationsLinks {
|
static class ModificationsLinks {
|
||||||
private final LinkBuilder modificationsLinkBuilder;
|
private final LinkBuilder modificationsLinkBuilder;
|
||||||
|
|
||||||
ModificationsLinks(ScmPathInfo uriInfo) {
|
ModificationsLinks(ScmPathInfo pathInfo) {
|
||||||
modificationsLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, ModificationsRootResource.class);
|
modificationsLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, ModificationsRootResource.class);
|
||||||
}
|
}
|
||||||
String self(String namespace, String name, String revision) {
|
String self(String namespace, String name, String revision) {
|
||||||
return modificationsLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("modifications").parameters().method("get").parameters(revision).href();
|
return modificationsLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("modifications").parameters().method("get").parameters(revision).href();
|
||||||
@@ -328,8 +326,8 @@ class ResourceLinks {
|
|||||||
static class FileHistoryLinks {
|
static class FileHistoryLinks {
|
||||||
private final LinkBuilder fileHistoryLinkBuilder;
|
private final LinkBuilder fileHistoryLinkBuilder;
|
||||||
|
|
||||||
FileHistoryLinks(ScmPathInfo uriInfo) {
|
FileHistoryLinks(ScmPathInfo pathInfo) {
|
||||||
fileHistoryLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, FileHistoryRootResource.class);
|
fileHistoryLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, FileHistoryRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name, String changesetId, String path) {
|
String self(String namespace, String name, String changesetId, String path) {
|
||||||
@@ -345,8 +343,8 @@ class ResourceLinks {
|
|||||||
static class SourceLinks {
|
static class SourceLinks {
|
||||||
private final LinkBuilder sourceLinkBuilder;
|
private final LinkBuilder sourceLinkBuilder;
|
||||||
|
|
||||||
SourceLinks(ScmPathInfo uriInfo) {
|
SourceLinks(ScmPathInfo pathInfo) {
|
||||||
sourceLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, SourceRootResource.class);
|
sourceLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, SourceRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String namespace, String name, String revision) {
|
String self(String namespace, String name, String revision) {
|
||||||
@@ -378,8 +376,8 @@ class ResourceLinks {
|
|||||||
static class PermissionLinks {
|
static class PermissionLinks {
|
||||||
private final LinkBuilder permissionLinkBuilder;
|
private final LinkBuilder permissionLinkBuilder;
|
||||||
|
|
||||||
PermissionLinks(ScmPathInfo uriInfo) {
|
PermissionLinks(ScmPathInfo pathInfo) {
|
||||||
permissionLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, PermissionRootResource.class);
|
permissionLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, PermissionRootResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String all(String namespace, String name) {
|
String all(String namespace, String name) {
|
||||||
@@ -415,8 +413,8 @@ class ResourceLinks {
|
|||||||
static class UIPluginLinks {
|
static class UIPluginLinks {
|
||||||
private final LinkBuilder uiPluginLinkBuilder;
|
private final LinkBuilder uiPluginLinkBuilder;
|
||||||
|
|
||||||
UIPluginLinks(ScmPathInfo uriInfo) {
|
UIPluginLinks(ScmPathInfo pathInfo) {
|
||||||
uiPluginLinkBuilder = new LinkBuilder(uriInfo, UIRootResource.class, UIPluginResource.class);
|
uiPluginLinkBuilder = new LinkBuilder(pathInfo, UIRootResource.class, UIPluginResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self(String id) {
|
String self(String id) {
|
||||||
@@ -431,8 +429,8 @@ class ResourceLinks {
|
|||||||
static class UIPluginCollectionLinks {
|
static class UIPluginCollectionLinks {
|
||||||
private final LinkBuilder uiPluginCollectionLinkBuilder;
|
private final LinkBuilder uiPluginCollectionLinkBuilder;
|
||||||
|
|
||||||
UIPluginCollectionLinks(ScmPathInfo uriInfo) {
|
UIPluginCollectionLinks(ScmPathInfo pathInfo) {
|
||||||
uiPluginCollectionLinkBuilder = new LinkBuilder(uriInfo, UIRootResource.class, UIPluginResource.class);
|
uiPluginCollectionLinkBuilder = new LinkBuilder(pathInfo, UIRootResource.class, UIPluginResource.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String self() {
|
String self() {
|
||||||
|
|||||||
@@ -82,7 +82,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
|
|||||||
private final KeyGenerator keyGenerator;
|
private final KeyGenerator keyGenerator;
|
||||||
private final RepositoryDAO repositoryDAO;
|
private final RepositoryDAO repositoryDAO;
|
||||||
private final Set<Type> types;
|
private final Set<Type> types;
|
||||||
private RepositoryMatcher repositoryMatcher;
|
|
||||||
private NamespaceStrategy namespaceStrategy;
|
private NamespaceStrategy namespaceStrategy;
|
||||||
private final ManagerDaoAdapter<Repository> managerDaoAdapter;
|
private final ManagerDaoAdapter<Repository> managerDaoAdapter;
|
||||||
|
|
||||||
@@ -91,12 +90,10 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
|
|||||||
public DefaultRepositoryManager(ScmConfiguration configuration,
|
public DefaultRepositoryManager(ScmConfiguration configuration,
|
||||||
SCMContextProvider contextProvider, KeyGenerator keyGenerator,
|
SCMContextProvider contextProvider, KeyGenerator keyGenerator,
|
||||||
RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
|
RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
|
||||||
RepositoryMatcher repositoryMatcher,
|
|
||||||
NamespaceStrategy namespaceStrategy) {
|
NamespaceStrategy namespaceStrategy) {
|
||||||
this.configuration = configuration;
|
this.configuration = configuration;
|
||||||
this.keyGenerator = keyGenerator;
|
this.keyGenerator = keyGenerator;
|
||||||
this.repositoryDAO = repositoryDAO;
|
this.repositoryDAO = repositoryDAO;
|
||||||
this.repositoryMatcher = repositoryMatcher;
|
|
||||||
this.namespaceStrategy = namespaceStrategy;
|
this.namespaceStrategy = namespaceStrategy;
|
||||||
|
|
||||||
ThreadFactory factory = new ThreadFactoryBuilder()
|
ThreadFactory factory = new ThreadFactoryBuilder()
|
||||||
|
|||||||
@@ -54,7 +54,6 @@ import org.junit.runner.RunWith;
|
|||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.junit.MockitoJUnitRunner;
|
import org.mockito.junit.MockitoJUnitRunner;
|
||||||
import sonia.scm.SCMContextProvider;
|
import sonia.scm.SCMContextProvider;
|
||||||
import sonia.scm.Type;
|
|
||||||
import sonia.scm.cache.GuavaCacheManager;
|
import sonia.scm.cache.GuavaCacheManager;
|
||||||
import sonia.scm.config.ScmConfiguration;
|
import sonia.scm.config.ScmConfiguration;
|
||||||
import sonia.scm.security.AuthorizationCollector;
|
import sonia.scm.security.AuthorizationCollector;
|
||||||
@@ -120,7 +119,6 @@ public class DefaultRepositoryManagerPerfTest {
|
|||||||
keyGenerator,
|
keyGenerator,
|
||||||
repositoryDAO,
|
repositoryDAO,
|
||||||
handlerSet,
|
handlerSet,
|
||||||
repositoryMatcher,
|
|
||||||
namespaceStrategy
|
namespaceStrategy
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ import sonia.scm.store.ConfigurationStoreFactory;
|
|||||||
import sonia.scm.store.JAXBConfigurationStoreFactory;
|
import sonia.scm.store.JAXBConfigurationStoreFactory;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
@@ -441,7 +440,7 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
|
|||||||
when(namespaceStrategy.createNamespace(Mockito.any(Repository.class))).thenAnswer(invocation -> mockedNamespace);
|
when(namespaceStrategy.createNamespace(Mockito.any(Repository.class))).thenAnswer(invocation -> mockedNamespace);
|
||||||
|
|
||||||
return new DefaultRepositoryManager(configuration, contextProvider,
|
return new DefaultRepositoryManager(configuration, contextProvider,
|
||||||
keyGenerator, repositoryDAO, handlerSet, createRepositoryMatcher(), namespaceStrategy);
|
keyGenerator, repositoryDAO, handlerSet, namespaceStrategy);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createRepository(RepositoryManager m, Repository repository) throws AlreadyExistsException {
|
private void createRepository(RepositoryManager m, Repository repository) throws AlreadyExistsException {
|
||||||
@@ -467,10 +466,6 @@ public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository> {
|
|||||||
assertEquals(repo.getLastModified(), other.getLastModified());
|
assertEquals(repo.getLastModified(), other.getLastModified());
|
||||||
}
|
}
|
||||||
|
|
||||||
private RepositoryMatcher createRepositoryMatcher() {
|
|
||||||
return new RepositoryMatcher(Collections.<RepositoryPathMatcher>emptySet());
|
|
||||||
}
|
|
||||||
|
|
||||||
private Repository createRepository(Repository repository) throws AlreadyExistsException {
|
private Repository createRepository(Repository repository) throws AlreadyExistsException {
|
||||||
manager.create(repository);
|
manager.create(repository);
|
||||||
assertNotNull(repository.getId());
|
assertNotNull(repository.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user