Skip to content

Commit

Permalink
refactor(git-parse): Renamed GitConfigExtractor -> GitConfigNameVersi…
Browse files Browse the repository at this point in the history 
…onTransformer.
  • Loading branch information
@JakeMathews
JakeMathews committed Apr 9, 2020
1 parent 56e38b3 commit 4746805
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions ...n/java/com/synopsys/integration/detectable/detectables/git/parsing/GitParseExtractor.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -63,7 +63,7 @@ public final Extraction extract(final File gitConfigFile, final File gitHeadFile
final List<GitConfigNode> 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()
Expand Down
6 changes: 3 additions & 3 deletions ...git/parsing/parse/GitConfigExtractor.java → ...arse/GitConfigNameVersionTransformer.java
View file
Expand Up @@ -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<GitConfigBranch> currentBranch = gitConfig.getGitConfigBranches().stream()
.filter(it -> it.getMerge().equalsIgnoreCase(gitHead))
.findFirst();
Expand Down
8 changes: 4 additions & 4 deletions detectable/src/main/java/com/synopsys/integration/detectable/factory/DetectableFactory.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -444,16 +444,16 @@ private GitFileParser gitFileParser() {
return new GitFileParser();
}

private GitConfigExtractor gitConfigExtractor() {
return new GitConfigExtractor(gitUrlParser());
private GitConfigNameVersionTransformer gitConfigNameVersionTransformer() {
return new GitConfigNameVersionTransformer(gitUrlParser());
}

private GitConfigNodeTransformer gitConfigNodeTransformer() {
return new GitConfigNodeTransformer();
}

private GitParseExtractor gitParseExtractor() {
return new GitParseExtractor(gitFileParser(), gitConfigExtractor(), gitConfigNodeTransformer());
return new GitParseExtractor(gitFileParser(), gitConfigNameVersionTransformer(), gitConfigNodeTransformer());
}

private GitUrlParser gitUrlParser() {
Expand Down
12 changes: 6 additions & 6 deletions ...bles/git/unit/GitFileTransformerTest.java → .../GitConfigNameVersionTransformerTest.java
View file
Expand Up @@ -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 {
Expand All @@ -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());
Expand All @@ -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());
Expand Down

0 comments on commit 4746805

Please sign in to comment.