Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

Cleanup names, dead code and logging

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-17 09:15:40 +02:00
parent a5dcc8cf8a
commit 37ce4fbabe
7 changed files with 53 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-core/src/main/java/sonia/scm/api/v2/resources/LinkBuilder.java
View File

@@ -13,7 +13,7 @@ import java.util.Arrays;
* builder for each method.
*
* <pre>
* LinkBuilder builder = new LinkBuilder(uriInfo, MainResource.class, SubResource.class);
* LinkBuilder builder = new LinkBuilder(pathInfo, MainResource.class, SubResource.class);
* Link link = builder
* .method("sub")
* .parameters("param")
@@ -24,16 +24,16 @@ import java.util.Arrays;
*/
@SuppressWarnings("WeakerAccess") // Non-public will result in IllegalAccessError for plugins
public class LinkBuilder {
private final ScmPathInfo uriInfo;
private final ScmPathInfo pathInfo;
private final Class[] classes;
private final ImmutableList<Call> calls;
public LinkBuilder(ScmPathInfo uriInfo, Class... classes) {
this(uriInfo, classes, ImmutableList.of());
public LinkBuilder(ScmPathInfo pathInfo, Class... classes) {
this(pathInfo, classes, ImmutableList.of());
}
private LinkBuilder(ScmPathInfo uriInfo, Class[] classes, ImmutableList<Call> calls) {
this.uriInfo = uriInfo;
private LinkBuilder(ScmPathInfo pathInfo, Class[] classes, ImmutableList<Call> calls) {
this.pathInfo = pathInfo;
this.classes = classes;
this.calls = calls;
}
@@ -50,7 +50,7 @@ public class LinkBuilder {
throw new IllegalStateException("not enough methods for all classes");
}
URI baseUri = uriInfo.getApiRestUri();
URI baseUri = pathInfo.getApiRestUri();
URI relativeUri = createRelativeUri();
return baseUri.resolve(relativeUri);
}
@@ -60,7 +60,7 @@ public class LinkBuilder {
}
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) {

2
scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
View File

@@ -64,7 +64,7 @@ public abstract class InitializingHttpScmProtocolWrapper implements ScmProtocolP
}
private String getPathFromConfiguration() {
logger.debug("using base path from configuration: " + scmConfiguration.getBaseUrl());
logger.debug("using base path from configuration: {}", scmConfiguration.getBaseUrl());
return scmConfiguration.getBaseUrl();
}