Skip to content

Commit 9df2ece

Browse files
committed
Consistent formatting
1 parent 78a6b0b commit 9df2ece

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public static void notifyBuildStatus(UsernamePasswordCredentials credentials, bo
253253
}
254254
}
255255

256-
if(repoSlug != null && commitId != null) {
256+
if (repoSlug != null && commitId != null) {
257257
buildStatusResource = new BitbucketBuildStatusResource(buildStatusResource.getOwner(), repoSlug, commitId);
258258
}
259259

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifier.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ private StandardUsernamePasswordCredentials getCredentials(AbstractBuild<?,?> bu
9999

100100
@Override
101101
public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
102-
103102
if (!this.notifyStart) {
104103
return true;
105104
}
@@ -120,7 +119,6 @@ public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
120119

121120
@Override
122121
public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
123-
124122
if (!this.notifyFinish) {
125123
return true;
126124
}
@@ -160,7 +158,7 @@ public boolean needsToRunAfterFinalized() {
160158
public static class DescriptorImpl extends BuildStepDescriptor<Publisher> {
161159

162160
private String globalCredentialsId;
163-
161+
164162
public DescriptorImpl() {
165163
load();
166164
}
@@ -240,7 +238,6 @@ public FormValidation doCheckGlobalCredentialsId(@QueryParameter final String gl
240238
}
241239

242240
private FormValidation checkCredentials(UsernamePasswordCredentials credentials) {
243-
244241
try {
245242
OAuthConfig config = new OAuthConfig(credentials.getUsername(), credentials.getPassword().getPlainText());
246243
BitbucketApiService apiService = (BitbucketApiService) new BitbucketApi().createService(config);

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ public class BitbucketBuildStatusNotifierStep extends AbstractStepImpl {
5454
private static final BitbucketHostValidator hostValidator = new BitbucketHostValidator();
5555

5656
private String credentialsId;
57-
public String getCredentialsId() {
58-
return this.credentialsId;
59-
}
60-
57+
public String getCredentialsId() { return this.credentialsId; }
6158
@DataBoundSetter public void setCredentialsId(String credentialsId) {
6259
this.credentialsId = credentialsId;
6360
}
@@ -166,7 +163,7 @@ private void readGlobalConfiguration() {
166163
try {
167164
config.unmarshal(cfg);
168165
step.getDescriptor().setGlobalCredentialsId(cfg.getGlobalCredentialsId());
169-
} catch(IOException e) {
166+
} catch (IOException e) {
170167
logger.warning("Unable to read BitbucketBuildStatusNotifier configuration");
171168
}
172169
}
@@ -178,17 +175,17 @@ public Void run() throws Exception {
178175
String buildState = step.getBuildState();
179176

180177
String buildKey = step.getBuildKey();
181-
if(buildKey == null) {
178+
if (buildKey == null) {
182179
buildKey = BitbucketBuildStatusHelper.defaultBitbucketBuildKeyFromBuild(build);
183180
}
184181

185182
String buildName = step.getBuildName();
186-
if(buildName == null) {
183+
if (buildName == null) {
187184
buildName = BitbucketBuildStatusHelper.defaultBitbucketBuildNameFromBuild(build);
188185
}
189186

190187
String buildDescription = step.getBuildDescription();
191-
if(buildDescription == null) {
188+
if (buildDescription == null) {
192189
buildDescription = BitbucketBuildStatusHelper.defaultBitbucketBuildDescriptionFromBuild(build);
193190
}
194191

src/main/java/org/jenkinsci/plugins/bitbucket/validator/BitbucketHostValidator.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@
2727
import com.google.common.collect.ImmutableSet;
2828
import java.util.Set;
2929

30-
public class BitbucketHostValidator
31-
{
30+
public class BitbucketHostValidator {
3231
final Set<String> supportedDomains = ImmutableSet.of("bitbucket.org", "altssh.bitbucket.org");
3332

34-
public boolean isValid(final String $value)
35-
{
33+
public boolean isValid(final String $value) {
3634
return this.supportedDomains.contains($value);
3735
}
3836

39-
public String renderError()
40-
{
37+
public String renderError() {
4138
return "Bitbucket build notifier support only repositories hosted in bitbucket.org";
4239
}
4340
}

0 commit comments

Comments
 (0)