Skip to content

Commit cf25c4f

Browse files
proskijakub-bochenski
authored andcommitted
Use logger names automatically derived from the containing class names
StashBuildListener and StashPullRequestsBuilder were using "StashBuildTrigger" instead of their own names. Co-developed-by: Anders Hammar <[email protected]> Co-developed-by: jakub-bochenski <[email protected]>
1 parent 1c59885 commit cf25c4f

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildListener.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import hudson.model.AbstractBuild;
55
import hudson.model.TaskListener;
66
import hudson.model.listeners.RunListener;
7+
import java.lang.invoke.MethodHandles;
78
import java.util.logging.Logger;
89
import javax.annotation.Nonnull;
910

1011
/** Created by Nathan McCarthy */
1112
@Extension
1213
public class StashBuildListener extends RunListener<AbstractBuild> {
13-
private static final Logger logger = Logger.getLogger(StashBuildTrigger.class.getName());
14+
private static final Logger logger =
15+
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
1416

1517
@Override
1618
public void onStarted(AbstractBuild abstractBuild, TaskListener listener) {

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import hudson.triggers.Trigger;
2828
import hudson.triggers.TriggerDescriptor;
2929
import hudson.util.ListBoxModel;
30+
import java.lang.invoke.MethodHandles;
3031
import java.util.ArrayList;
3132
import java.util.List;
3233
import java.util.Map;
@@ -47,7 +48,8 @@
4748
/** Created by Nathan McCarthy */
4849
@SuppressFBWarnings({"WMI_WRONG_MAP_ITERATOR", "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"})
4950
public class StashBuildTrigger extends Trigger<AbstractProject<?, ?>> {
50-
private static final Logger logger = Logger.getLogger(StashBuildTrigger.class.getName());
51+
private static final Logger logger =
52+
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
5153
private final String projectPath;
5254
private final String cron;
5355
private final String stashHost;

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuilds.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
import hudson.model.Result;
77
import hudson.model.TaskListener;
88
import java.io.IOException;
9+
import java.lang.invoke.MethodHandles;
910
import java.util.logging.Level;
1011
import java.util.logging.Logger;
1112
import jenkins.model.JenkinsLocationConfiguration;
1213

1314
/** Created by Nathan McCarthy */
1415
public class StashBuilds {
15-
private static final Logger logger = Logger.getLogger(StashBuilds.class.getName());
16+
private static final Logger logger =
17+
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
1618
private StashBuildTrigger trigger;
1719
private StashRepository repository;
1820

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashPullRequestsBuilder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
import static java.lang.String.format;
44

55
import hudson.model.AbstractProject;
6+
import java.lang.invoke.MethodHandles;
67
import java.util.Collection;
78
import java.util.logging.Logger;
89
import javax.annotation.Nonnull;
910
import stashpullrequestbuilder.stashpullrequestbuilder.stash.StashPullRequestResponseValue;
1011

1112
/** Created by Nathan McCarthy */
1213
public class StashPullRequestsBuilder {
13-
private static final Logger logger = Logger.getLogger(StashBuildTrigger.class.getName());
14+
private static final Logger logger =
15+
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
1416
private AbstractProject<?, ?> project;
1517
private StashBuildTrigger trigger;
1618
private StashRepository repository;

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
66
import hudson.model.Result;
7+
import java.lang.invoke.MethodHandles;
78
import java.util.AbstractMap;
89
import java.util.ArrayList;
910
import java.util.Collection;
@@ -23,7 +24,8 @@
2324
/** Created by Nathan McCarthy */
2425
@SuppressFBWarnings("WMI_WRONG_MAP_ITERATOR")
2526
public class StashRepository {
26-
private static final Logger logger = Logger.getLogger(StashRepository.class.getName());
27+
private static final Logger logger =
28+
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
2729
public static final String BUILD_START_MARKER = "[*BuildStarted* **%s**] %s into %s";
2830
public static final String BUILD_FINISH_MARKER = "[*BuildFinished* **%s**] %s into %s";
2931

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/stash/StashApiClient.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.io.InputStream;
66
import java.io.StringWriter;
77
import java.io.UnsupportedEncodingException;
8+
import java.lang.invoke.MethodHandles;
89
import java.net.InetAddress;
910
import java.net.InetSocketAddress;
1011
import java.net.Socket;
@@ -53,7 +54,8 @@ public class StashApiClient {
5354
private static final int HTTP_CONNECTION_TIMEOUT_SECONDS = 15;
5455
private static final int HTTP_SOCKET_TIMEOUT_SECONDS = 15;
5556

56-
private static final Logger logger = Logger.getLogger(StashApiClient.class.getName());
57+
private static final Logger logger =
58+
Logger.getLogger(MethodHandles.lookup().lookupClass().getName());
5759
private static final ObjectMapper mapper = new ObjectMapper();
5860

5961
private String apiBaseUrl;

0 commit comments

Comments
 (0)