Skip to content

Commit 6905913

Browse files
basilbasil
authored
Format code with Spotless (#210)
1 parent f1b3521 commit 6905913

File tree

13 files changed

+453
-474
lines changed

13 files changed

+453
-474
lines changed

‎pom.xml‎

Lines changed: 94 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,107 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.jenkins-ci.plugins</groupId>
6-
<artifactId>plugin</artifactId>
7-
<version>4.71</version>
8-
<relativePath />
9-
</parent>
10-
<groupId>org.jvnet.hudson.plugins</groupId>
11-
<artifactId>chucknorris</artifactId>
12-
<version>${changelist}</version>
13-
<name>ChuckNorris Plugin</name>
14-
<description>Displays a picture of Chuck Norris (instead of Jenkins the butler) and a random Chuck Norris 'The Programmer' fact on each build page.</description>
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.jenkins-ci.plugins</groupId>
6+
<artifactId>plugin</artifactId>
7+
<version>4.71</version>
8+
<relativePath />
9+
</parent>
1510

16-
<properties>
17-
<changelist>999999-SNAPSHOT</changelist>
18-
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
19-
<jenkins.version>2.387.3</jenkins.version>
20-
</properties>
11+
<groupId>org.jvnet.hudson.plugins</groupId>
12+
<artifactId>chucknorris</artifactId>
13+
<version>${changelist}</version>
14+
<packaging>hpi</packaging>
15+
<name>ChuckNorris Plugin</name>
16+
<description>Displays a picture of Chuck Norris (instead of Jenkins the butler) and a random Chuck Norris 'The Programmer' fact on each build page.</description>
17+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
2118

22-
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
23-
<packaging>hpi</packaging>
19+
<licenses>
20+
<license>
21+
<name>MIT License</name>
22+
<url>LICENSE.txt</url>
23+
</license>
24+
</licenses>
2425

25-
<developers>
26-
<developer>
27-
<id>batmat</id>
28-
<name>Baptiste Mathus</name>
29-
<email>batmat@batmat.net</email>
30-
<timezone>Europe/Paris</timezone>
31-
</developer>
32-
<developer>
33-
<id>oleg_nenashev</id>
34-
<name>Oleg Nenashev</name>
35-
<timezone>Europe/Zurich</timezone>
36-
</developer>
37-
</developers>
38-
<licenses>
39-
<license>
40-
<name>MIT License</name>
41-
<url>LICENSE.txt</url>
42-
</license>
43-
</licenses>
26+
<developers>
27+
<developer>
28+
<id>batmat</id>
29+
<name>Baptiste Mathus</name>
30+
<email>batmat@batmat.net</email>
31+
<timezone>Europe/Paris</timezone>
32+
</developer>
33+
<developer>
34+
<id>oleg_nenashev</id>
35+
<name>Oleg Nenashev</name>
36+
<timezone>Europe/Zurich</timezone>
37+
</developer>
38+
</developers>
4439

45-
<dependencyManagement>
46-
<dependencies>
47-
<dependency>
48-
<groupId>io.jenkins.tools.bom</groupId>
49-
<artifactId>bom-2.387.x</artifactId>
50-
<version>2244.vd60654536b_96</version>
51-
<scope>import</scope>
52-
<type>pom</type>
53-
</dependency>
54-
</dependencies>
55-
</dependencyManagement>
40+
<scm>
41+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
42+
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
43+
<tag>${scmTag}</tag>
44+
<url>https://github.com/${gitHubRepo}</url>
45+
</scm>
5646

47+
<properties>
48+
<changelist>999999-SNAPSHOT</changelist>
49+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
50+
<jenkins.version>2.387.3</jenkins.version>
51+
<spotless.check.skip>false</spotless.check.skip>
52+
</properties>
53+
54+
<dependencyManagement>
5755
<dependencies>
58-
<dependency>
59-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
60-
<artifactId>workflow-step-api</artifactId>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.mockito</groupId>
64-
<artifactId>mockito-core</artifactId>
65-
<scope>test</scope>
66-
</dependency>
67-
<dependency>
68-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
69-
<artifactId>workflow-support</artifactId>
70-
<classifier>tests</classifier>
71-
<scope>test</scope>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
75-
<artifactId>workflow-job</artifactId>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
80-
<artifactId>workflow-cps</artifactId>
81-
<scope>test</scope>
82-
</dependency>
56+
<dependency>
57+
<groupId>io.jenkins.tools.bom</groupId>
58+
<artifactId>bom-2.387.x</artifactId>
59+
<version>2244.vd60654536b_96</version>
60+
<type>pom</type>
61+
<scope>import</scope>
62+
</dependency>
8363
</dependencies>
64+
</dependencyManagement>
8465

85-
<repositories>
86-
<repository>
87-
<id>repo.jenkins-ci.org</id>
88-
<url>https://repo.jenkins-ci.org/public/</url>
89-
</repository>
90-
</repositories>
66+
<dependencies>
67+
<dependency>
68+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
69+
<artifactId>workflow-step-api</artifactId>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
73+
<artifactId>workflow-cps</artifactId>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
78+
<artifactId>workflow-job</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
83+
<artifactId>workflow-support</artifactId>
84+
<classifier>tests</classifier>
85+
<scope>test</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.mockito</groupId>
89+
<artifactId>mockito-core</artifactId>
90+
<scope>test</scope>
91+
</dependency>
92+
</dependencies>
9193

92-
<scm>
93-
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
94-
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
95-
<url>https://github.com/${gitHubRepo}</url>
96-
<tag>${scmTag}</tag>
97-
</scm>
94+
<repositories>
95+
<repository>
96+
<id>repo.jenkins-ci.org</id>
97+
<url>https://repo.jenkins-ci.org/public/</url>
98+
</repository>
99+
</repositories>
98100

99-
<pluginRepositories>
100-
<pluginRepository>
101-
<id>repo.jenkins-ci.org</id>
102-
<url>https://repo.jenkins-ci.org/public/</url>
103-
</pluginRepository>
104-
</pluginRepositories>
101+
<pluginRepositories>
102+
<pluginRepository>
103+
<id>repo.jenkins-ci.org</id>
104+
<url>https://repo.jenkins-ci.org/public/</url>
105+
</pluginRepository>
106+
</pluginRepositories>
105107
</project>

‎src/main/java/hudson/plugins/chucknorris/BeardDescriptor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ public final String getDisplayName() {
6060
* @return true - of course the beard is applicable
6161
*/
6262
@Override
63-
public final boolean isApplicable(
64-
final Class<? extends AbstractProject> clazz) {
63+
public final boolean isApplicable(final Class<? extends AbstractProject> clazz) {
6564
return true;
6665
}
6766
}

‎src/main/java/hudson/plugins/chucknorris/CordellWalkerRecorder.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222
package hudson.plugins.chucknorris;
2323

24+
import edu.umd.cs.findbugs.annotations.NonNull;
2425
import hudson.FilePath;
2526
import hudson.Launcher;
2627
import hudson.model.AbstractBuild;
@@ -32,15 +33,11 @@
3233
import hudson.model.TaskListener;
3334
import hudson.tasks.BuildStepMonitor;
3435
import hudson.tasks.Recorder;
35-
3636
import java.io.IOException;
3737
import java.util.logging.Logger;
38-
3938
import jenkins.tasks.SimpleBuildStep;
4039
import org.kohsuke.stapler.DataBoundConstructor;
4140

42-
import edu.umd.cs.findbugs.annotations.NonNull;
43-
4441
/**
4542
* This class associates a RoundhouseAction to a job or a build. For more info
4643
* on Cordell Walker, check out <a
@@ -53,8 +50,7 @@ public class CordellWalkerRecorder extends Recorder implements SimpleBuildStep {
5350
/**
5451
* Logger.
5552
*/
56-
private static final Logger LOGGER = Logger
57-
.getLogger(CordellWalkerRecorder.class.getName());
53+
private static final Logger LOGGER = Logger.getLogger(CordellWalkerRecorder.class.getName());
5854

5955
/**
6056
* Fact generator.
@@ -119,8 +115,7 @@ public final Action getProjectAction(final AbstractProject<?, ?> project) {
119115
* when there's an IO error
120116
*/
121117
@Override
122-
public final boolean perform(final AbstractBuild<?, ?> build,
123-
final Launcher launcher, final BuildListener listener)
118+
public final boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener)
124119
throws InterruptedException, IOException {
125120
perform(build);
126121
return true;
@@ -144,8 +139,10 @@ public final boolean perform(final AbstractBuild<?, ?> build,
144139
*/
145140
@Override
146141
public final void perform(
147-
@NonNull final Run<?, ?> run, @NonNull final FilePath workspace,
148-
@NonNull final Launcher launcher, @NonNull final TaskListener listener)
142+
@NonNull final Run<?, ?> run,
143+
@NonNull final FilePath workspace,
144+
@NonNull final Launcher launcher,
145+
@NonNull final TaskListener listener)
149146
throws InterruptedException, IOException {
150147
perform(run);
151148
}
@@ -154,6 +151,7 @@ public final void perform(
154151
* Gets the required monitor service.
155152
* @return the BuildStepMonitor
156153
*/
154+
@Override
157155
public final BuildStepMonitor getRequiredMonitorService() {
158156
return BuildStepMonitor.NONE;
159157
}
@@ -169,5 +167,4 @@ public void perform(final Run<?, ?> run) {
169167
String fact = factGenerator.random();
170168
run.addAction(new RoundhouseAction(style, fact));
171169
}
172-
173170
}

0 commit comments

Comments
 (0)