Skip to content

Commit

Permalink
optimized imports to address Checkstyle errors
Browse files Browse the repository at this point in the history
  • Loading branch information
seb-lie committed Mar 1, 2019
1 parent 6bc46e1 commit 83075a2
Showing 1 changed file with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,17 @@
package com.cloudbees.jenkins.plugins.bitbucket.filesystem;

import com.cloudbees.jenkins.plugins.bitbucket.BranchSCMHead;
import com.cloudbees.jenkins.plugins.bitbucket.JsonParser;
import com.cloudbees.jenkins.plugins.bitbucket.PullRequestSCMHead;
import java.util.Map;

import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.IOException;
import java.io.InputStream;
import jenkins.scm.api.SCMFile;
import jenkins.scm.api.SCMHead;
import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;

public class BitbucketSCMFile extends SCMFile {
import java.io.IOException;
import java.io.InputStream;

public class BitbucketSCMFile extends SCMFile {

private final BitbucketApi api;
private SCMHead head;
Expand Down Expand Up @@ -118,8 +116,7 @@ public InputStream content() throws IOException, InterruptedException {
}
try {
return api.getFileContent(this);
} catch (IOException e)
{
} catch (IOException e) {
// TODO: Disable light-weight fallback to full checkout on merge conflicts
throw e;
}
Expand All @@ -134,7 +131,7 @@ public long lastModified() throws IOException, InterruptedException {
@Override
@NonNull
protected SCMFile newChild(String name, boolean assumeIsDirectory) {
return new BitbucketSCMFile(this, name, assumeIsDirectory?Type.DIRECTORY:Type.REGULAR_FILE, hash);
return new BitbucketSCMFile(this, name, assumeIsDirectory ? Type.DIRECTORY : Type.REGULAR_FILE, hash);
}

@Override
Expand Down

0 comments on commit 83075a2

Please sign in to comment.