Rename UriInfoStore to ScmPathInfoStore

This commit is contained in:
René Pfeuffer
2018-09-12 08:53:15 +02:00
parent f718a2ba4c
commit 7c09f35ac8
30 changed files with 89 additions and 90 deletions

View File

@@ -8,11 +8,11 @@ import static de.otto.edison.hal.Links.linkingTo;
public class HgConfigInstallationsToDtoMapper {
private UriInfoStore uriInfoStore;
private ScmPathInfoStore scmPathInfoStore;
@Inject
public HgConfigInstallationsToDtoMapper(UriInfoStore uriInfoStore) {
this.uriInfoStore = uriInfoStore;
public HgConfigInstallationsToDtoMapper(ScmPathInfoStore scmPathInfoStore) {
this.scmPathInfoStore = scmPathInfoStore;
}
public HgConfigInstallationsDto map(List<String> installations, String path) {
@@ -20,7 +20,7 @@ public class HgConfigInstallationsToDtoMapper {
}
private String createSelfLink(String path) {
LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
return linkBuilder.method("getInstallationsResource").parameters().href() + '/' + path;
}
}

View File

@@ -20,7 +20,7 @@ import static de.otto.edison.hal.Links.linkingTo;
public abstract class HgConfigPackagesToDtoMapper {
@Inject
private UriInfoStore uriInfoStore;
private ScmPathInfoStore scmPathInfoStore;
public HgConfigPackagesDto map(HgPackages hgpackages) {
return map(new HgPackagesNonIterable(hgpackages));
@@ -40,7 +40,7 @@ public abstract class HgConfigPackagesToDtoMapper {
}
private String createSelfLink() {
LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
return linkBuilder.method("getPackagesResource").parameters().href();
}

View File

@@ -18,7 +18,7 @@ import static de.otto.edison.hal.Links.linkingTo;
public abstract class HgConfigToHgConfigDtoMapper extends BaseMapper<HgConfig, HgConfigDto> {
@Inject
private UriInfoStore uriInfoStore;
private ScmPathInfoStore scmPathInfoStore;
@AfterMapping
void appendLinks(HgConfig config, @MappingTarget HgConfigDto target) {
@@ -30,12 +30,12 @@ public abstract class HgConfigToHgConfigDtoMapper extends BaseMapper<HgConfig, H
}
private String self() {
LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
return linkBuilder.method("get").parameters().href();
}
private String update() {
LinkBuilder linkBuilder = new LinkBuilder(uriInfoStore.get(), HgConfigResource.class);
LinkBuilder linkBuilder = new LinkBuilder(scmPathInfoStore.get(), HgConfigResource.class);
return linkBuilder.method("update").parameters().href();
}
}

View File

@@ -1,6 +1,6 @@
package sonia.scm.web;
import sonia.scm.api.v2.resources.UriInfoStore;
import sonia.scm.api.v2.resources.ScmPathInfoStore;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
@@ -11,7 +11,7 @@ import javax.inject.Singleton;
@Singleton
public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
@Inject
public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
}
}