From 4746805e7c79519edefeb12590aeaa48f4ad6e2b Mon Sep 17 00:00:00 2001 From: Jake Mathews Date: Thu, 9 Apr 2020 13:18:13 -0400 Subject: [PATCH] refactor(git-parse): Renamed GitConfigExtractor -> GitConfigNameVersionTransformer. --- .../detectables/git/parsing/GitParseExtractor.java | 8 ++++---- ...tor.java => GitConfigNameVersionTransformer.java} | 6 +++--- .../detectable/factory/DetectableFactory.java | 8 ++++---- ...java => GitConfigNameVersionTransformerTest.java} | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) rename detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/{GitConfigExtractor.java => GitConfigNameVersionTransformer.java} (92%) rename detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/{GitFileTransformerTest.java => GitConfigNameVersionTransformerTest.java} (87%) diff --git a/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/GitParseExtractor.java b/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/GitParseExtractor.java index 5249b36ca0..d540641e32 100644 --- a/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/GitParseExtractor.java +++ b/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/GitParseExtractor.java @@ -33,7 +33,7 @@ import com.synopsys.integration.detectable.Extraction; import com.synopsys.integration.detectable.detectables.git.parsing.model.GitConfig; import com.synopsys.integration.detectable.detectables.git.parsing.model.GitConfigNode; -import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigExtractor; +import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigNameVersionTransformer; import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigNodeTransformer; import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitFileParser; import com.synopsys.integration.exception.IntegrationException; @@ -45,10 +45,10 @@ public class GitParseExtractor { private final IntLogger logger = new Slf4jIntLogger(LoggerFactory.getLogger(this.getClass())); private final GitFileParser gitFileParser; - private final GitConfigExtractor gitConfigExtractor; + private final GitConfigNameVersionTransformer gitConfigExtractor; private final GitConfigNodeTransformer gitConfigNodeTransformer; - public GitParseExtractor(final GitFileParser gitFileParser, final GitConfigExtractor gitConfigExtractor, final GitConfigNodeTransformer gitConfigNodeTransformer) { + public GitParseExtractor(final GitFileParser gitFileParser, final GitConfigNameVersionTransformer gitConfigExtractor, final GitConfigNodeTransformer gitConfigNodeTransformer) { this.gitFileParser = gitFileParser; this.gitConfigExtractor = gitConfigExtractor; this.gitConfigNodeTransformer = gitConfigNodeTransformer; @@ -63,7 +63,7 @@ public final Extraction extract(final File gitConfigFile, final File gitHeadFile final List gitConfigNodes = gitFileParser.parseGitConfig(configFileContent); final GitConfig gitConfig = gitConfigNodeTransformer.createGitConfig(gitConfigNodes); - final NameVersion projectNameVersion = gitConfigExtractor.extractProjectInfo(gitConfig, gitHead); + final NameVersion projectNameVersion = gitConfigExtractor.transformToProjectInfo(gitConfig, gitHead); return new Extraction.Builder() .success() diff --git a/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/GitConfigExtractor.java b/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/GitConfigNameVersionTransformer.java similarity index 92% rename from detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/GitConfigExtractor.java rename to detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/GitConfigNameVersionTransformer.java index 060a3d0e97..651de69c89 100644 --- a/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/GitConfigExtractor.java +++ b/detectable/src/main/java/com/synopsys/integration/detectable/detectables/git/parsing/parse/GitConfigNameVersionTransformer.java @@ -35,16 +35,16 @@ import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.util.NameVersion; -public class GitConfigExtractor { +public class GitConfigNameVersionTransformer { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final GitUrlParser gitUrlParser; - public GitConfigExtractor(final GitUrlParser gitUrlParser) { + public GitConfigNameVersionTransformer(final GitUrlParser gitUrlParser) { this.gitUrlParser = gitUrlParser; } - public NameVersion extractProjectInfo(final GitConfig gitConfig, final String gitHead) throws IntegrationException, MalformedURLException { + public NameVersion transformToProjectInfo(final GitConfig gitConfig, final String gitHead) throws IntegrationException, MalformedURLException { final Optional currentBranch = gitConfig.getGitConfigBranches().stream() .filter(it -> it.getMerge().equalsIgnoreCase(gitHead)) .findFirst(); diff --git a/detectable/src/main/java/com/synopsys/integration/detectable/factory/DetectableFactory.java b/detectable/src/main/java/com/synopsys/integration/detectable/factory/DetectableFactory.java index 9a0e9b193c..f4aa3b3752 100644 --- a/detectable/src/main/java/com/synopsys/integration/detectable/factory/DetectableFactory.java +++ b/detectable/src/main/java/com/synopsys/integration/detectable/factory/DetectableFactory.java @@ -103,7 +103,7 @@ import com.synopsys.integration.detectable.detectables.git.cli.GitUrlParser; import com.synopsys.integration.detectable.detectables.git.parsing.GitParseDetectable; import com.synopsys.integration.detectable.detectables.git.parsing.GitParseExtractor; -import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigExtractor; +import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigNameVersionTransformer; import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigNodeTransformer; import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitFileParser; import com.synopsys.integration.detectable.detectables.go.godep.GoDepExtractor; @@ -444,8 +444,8 @@ private GitFileParser gitFileParser() { return new GitFileParser(); } - private GitConfigExtractor gitConfigExtractor() { - return new GitConfigExtractor(gitUrlParser()); + private GitConfigNameVersionTransformer gitConfigNameVersionTransformer() { + return new GitConfigNameVersionTransformer(gitUrlParser()); } private GitConfigNodeTransformer gitConfigNodeTransformer() { @@ -453,7 +453,7 @@ private GitConfigNodeTransformer gitConfigNodeTransformer() { } private GitParseExtractor gitParseExtractor() { - return new GitParseExtractor(gitFileParser(), gitConfigExtractor(), gitConfigNodeTransformer()); + return new GitParseExtractor(gitFileParser(), gitConfigNameVersionTransformer(), gitConfigNodeTransformer()); } private GitUrlParser gitUrlParser() { diff --git a/detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/GitFileTransformerTest.java b/detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/GitConfigNameVersionTransformerTest.java similarity index 87% rename from detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/GitFileTransformerTest.java rename to detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/GitConfigNameVersionTransformerTest.java index 654a84fe39..8cb72218ff 100644 --- a/detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/GitFileTransformerTest.java +++ b/detectable/src/test/java/com/synopsys/integration/detectable/detectables/git/unit/GitConfigNameVersionTransformerTest.java @@ -34,11 +34,11 @@ import com.synopsys.integration.detectable.detectables.git.parsing.model.GitConfig; import com.synopsys.integration.detectable.detectables.git.parsing.model.GitConfigBranch; import com.synopsys.integration.detectable.detectables.git.parsing.model.GitConfigRemote; -import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigExtractor; +import com.synopsys.integration.detectable.detectables.git.parsing.parse.GitConfigNameVersionTransformer; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.util.NameVersion; -class GitFileTransformerTest { +class GitConfigNameVersionTransformerTest { @Test void transform() throws MalformedURLException, IntegrationException { @@ -52,8 +52,8 @@ void transform() throws MalformedURLException, IntegrationException { final String gitHead = "refs/heads/master"; final GitUrlParser gitUrlParser = new GitUrlParser(); - final GitConfigExtractor gitFileTransformer = new GitConfigExtractor(gitUrlParser); - final NameVersion nameVersion = gitFileTransformer.extractProjectInfo(gitConfig, gitHead); + final GitConfigNameVersionTransformer gitConfigNameVersionTransformer = new GitConfigNameVersionTransformer(gitUrlParser); + final NameVersion nameVersion = gitConfigNameVersionTransformer.transformToProjectInfo(gitConfig, gitHead); Assertions.assertEquals("blackducksoftware/blackduck-artifactory", nameVersion.getName()); Assertions.assertEquals("master", nameVersion.getVersion()); @@ -74,8 +74,8 @@ void transformDetachedHead() throws MalformedURLException, IntegrationException final String gitHead = "9ec2a2bcfa8651b6e096b06d72b1b9290b429e3c"; final GitUrlParser gitUrlParser = new GitUrlParser(); - final GitConfigExtractor gitFileTransformer = new GitConfigExtractor(gitUrlParser); - final NameVersion nameVersion = gitFileTransformer.extractProjectInfo(gitConfig, gitHead); + final GitConfigNameVersionTransformer gitConfigNameVersionTransformer = new GitConfigNameVersionTransformer(gitUrlParser); + final NameVersion nameVersion = gitConfigNameVersionTransformer.transformToProjectInfo(gitConfig, gitHead); Assertions.assertEquals("blackducksoftware/synopsys-detect", nameVersion.getName()); Assertions.assertEquals("9ec2a2bcfa8651b6e096b06d72b1b9290b429e3c", nameVersion.getVersion());