diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 0bf7557..e26af0a 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -53,20 +53,20 @@ pipeline { } } } - // stage('Build Java 11') { - // steps { - // withMaven(maven: 'maven', jdk: 'JDK 11') { - // sh "${mvn} clean verify -Djava.version=11" - // } - // } - // } - // stage('Build Java 12') { - // steps { - // withMaven(maven: 'maven', jdk: 'JDK 12') { - // sh "${mvn} clean verify -Djava.version=12" - // } - // } - // } + stage('Build Java 11') { + steps { + withMaven(maven: 'maven', jdk: 'JDK 11') { + sh "${mvn} clean verify -Djava.version=11" + } + } + } + stage('Build Java 12') { + steps { + withMaven(maven: 'maven', jdk: 'JDK 12') { + sh "${mvn} clean verify -Djava.version=12" + } + } + } } } diff --git a/pom.xml b/pom.xml index 9f1fd0d..6306627 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,6 @@ 2.1.3 4.1.1 2.22.1 - 1.3.2 1.4.3 0.8 1.18.4 @@ -110,13 +109,6 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit-platform-surefire-provider.version} - - org.pitest diff --git a/src/main/java/net/kemitix/gitdb/GitDBBranch.java b/src/main/java/net/kemitix/gitdb/GitDBBranch.java index fe08fb9..8b35404 100644 --- a/src/main/java/net/kemitix/gitdb/GitDBBranch.java +++ b/src/main/java/net/kemitix/gitdb/GitDBBranch.java @@ -32,6 +32,13 @@ import net.kemitix.mon.result.Result; */ public interface GitDBBranch { + /** + * The name of the branch. + * + * @return the branch name + */ + Result name(); + /** * Lookup a value for the key. * diff --git a/src/main/java/net/kemitix/gitdb/impl/GitDBBranchImpl.java b/src/main/java/net/kemitix/gitdb/impl/GitDBBranchImpl.java index 92b495b..5e62500 100644 --- a/src/main/java/net/kemitix/gitdb/impl/GitDBBranchImpl.java +++ b/src/main/java/net/kemitix/gitdb/impl/GitDBBranchImpl.java @@ -34,7 +34,7 @@ import org.eclipse.jgit.lib.Repository; import java.util.function.Function; /** - * API for interacting with a branch in a GirDB. + * API for interacting with a branch in a GitDB. * * @author Paul Campbell (pcampbell@kemitix.net) */ @@ -73,6 +73,11 @@ class GitDBBranchImpl implements GitDBBranch { return Result.ok(new GitDBBranchImpl(branchRef, gitDBRepo, userName, userEmailAddress, branchRef.getName())); } + @Override + public Result name() { + return Result.ok(name); + } + @Override public Result> get(final String key) { return gitDBRepo.readValue(branchRef, KEY_PREFIX + key); diff --git a/src/test/java/net/kemitix/gitdb/test/GitDBTest.java b/src/test/java/net/kemitix/gitdb/test/GitDBTest.java index fdf15b8..dd65f50 100644 --- a/src/test/java/net/kemitix/gitdb/test/GitDBTest.java +++ b/src/test/java/net/kemitix/gitdb/test/GitDBTest.java @@ -392,4 +392,17 @@ class GitDBTest implements WithAssertions { ); } + @Test + void selectBranch_branchExists_thenBranchName() throws Throwable { + //given + final Path dbDir = dirDoesNotExist(); + final Result gitDb = gitDB(dbDir); + //when + final Result> branchName = gitDb.flatMap(selectBranch("master")) + .flatMap(branch -> Result.swap(branch.map(GitDBBranch::name))); + //then + assertThat(branchName.orElseThrow().toOptional()).as("Branch name is master") + .contains("refs/heads/master"); + } + }