Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose invoke method & required interface for downstream plugins #520

Merged
merged 6 commits into from
Aug 4, 2017
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions src/main/java/jenkins/plugins/git/GitSCMFileSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,41 @@ public SCMFile getRoot() {
return commitId;
}

/*package*/ <V> V invoke(final FSFunction<V> function) throws IOException, InterruptedException {
/**
* Called with an {@link FSFunction} callback with a singleton repository
* cache lock.
*
* An example usage might be:
*
* <pre>
* {@code
* return fs.invoke(new GitSCMFileSystem.FSFunction<byte[]>() {
* @Override
* public byte[] invoke(Repository repository) throws IOException, InterruptedException {
* Git activeRepo = getClonedRepository(repository);
* File repoDir = activeRepo.getRepository().getDirectory().getParentFile();
* System.out.println("Repo cloned to: " + repoDir.getCanonicalPath());
* try {
* File f = new File(repoDir, filePath);
* if (f.canRead()) {
* return IOUtils.toByteArray(new FileInputStream(f));
* }
* return null;
* } finally {
* FileUtils.deleteDirectory(repoDir);
* }
* }
* });
* }
* </pre>
*
* @param <V> return type
* @param function callback executed with a locked repository
* @return whatever you return from the provided function
* @throws IOException if there is an I/O error
* @throws InterruptedException if interrupted
*/
public <V> V invoke(final FSFunction<V> function) throws IOException, InterruptedException {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadocs

Lock cacheLock = AbstractGitSCMSource.getCacheLock(cacheEntry);
cacheLock.lock();
try {
Expand Down Expand Up @@ -211,7 +245,16 @@ public boolean changesSince(@CheckForNull SCMRevision revision, @NonNull OutputS
}
}

/*package*/ interface FSFunction<V> {
/**
* Simple callback that is used with
* {@link #invoke(jenkins.plugins.git.GitSCMFileSystem.FSFunction)}
* in order to provide a locked view of the Git repository
*/
public interface FSFunction<V> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If making public we should provide clear guidelines in javadocs

/**
* Called with a lock on the repository in order to perform some
* operations that might result in changes and necessary re-indexing
*/
V invoke(Repository repository) throws IOException, InterruptedException;
}

Expand Down