Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(bazel): delegate gav string parsing to BazelDependencyParser
- Loading branch information
Steve Billings
committed
Oct 7, 2019
1 parent
de24e0e
commit 760fdba
Showing
5 changed files
with
94 additions
and
17 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
...ain/java/com/synopsys/integration/detectable/detectables/bazel/BazelDependencyParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /** | ||
| * detectable | ||
| * | ||
| * Copyright (c) 2019 Synopsys, Inc. | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package com.synopsys.integration.detectable.detectables.bazel; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.synopsys.integration.bdio.model.dependency.Dependency; | ||
| import com.synopsys.integration.bdio.model.externalid.ExternalId; | ||
| import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; | ||
|
|
||
| public class BazelDependencyParser { | ||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||
| private final ExternalIdFactory externalIdFactory; | ||
|
|
||
| public BazelDependencyParser(final ExternalIdFactory externalIdFactory) { | ||
| this.externalIdFactory = externalIdFactory; | ||
| } | ||
|
|
||
| public Dependency gavStringToDependency(final String artifactString, final String separatorRegex) { | ||
| final String[] gavParts = artifactString.split(separatorRegex); | ||
| final String group = gavParts[0]; | ||
| final String artifact = gavParts[1]; | ||
| final String version = gavParts[2]; | ||
|
|
||
| logger.debug(String.format("Adding dependency from external id: %s:%s:%s", group, artifact, version)); | ||
| final ExternalId externalId = externalIdFactory.createMavenExternalId(group, artifact, version); | ||
| final Dependency artifactDependency = new Dependency(artifact, version, externalId); | ||
| return artifactDependency; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
.../integration/detectable/detectables/bazel/functional/bazel/BazelDependencyParserTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package com.synopsys.integration.detectable.detectables.bazel.functional.bazel; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.Mockito; | ||
|
|
||
| import com.synopsys.integration.bdio.model.Forge; | ||
| import com.synopsys.integration.bdio.model.dependency.Dependency; | ||
| import com.synopsys.integration.bdio.model.externalid.ExternalId; | ||
| import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; | ||
| import com.synopsys.integration.detectable.detectables.bazel.BazelDependencyParser; | ||
|
|
||
| public class BazelDependencyParserTest { | ||
|
|
||
| @Test | ||
| public void test() { | ||
| final ExternalIdFactory externalIdFactory = Mockito.mock(ExternalIdFactory.class); | ||
| final BazelDependencyParser bazelDependencyParser = new BazelDependencyParser(externalIdFactory); | ||
| // externalIdFactory.createMavenExternalId(group, artifact, version); | ||
| final ExternalId testExternalId = new ExternalId(Forge.MAVEN); | ||
| testExternalId.group = "testgroup"; | ||
| testExternalId.name = "testartifact"; | ||
| testExternalId.version = "testversion"; | ||
| Mockito.when(externalIdFactory.createMavenExternalId("testgroup", "testartifact", "testversion")).thenReturn(testExternalId); | ||
|
|
||
| final Dependency dependency = bazelDependencyParser.gavStringToDependency("testgroup:testartifact:testversion", ":"); | ||
|
|
||
| assertEquals("testartifact", dependency.externalId.name); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters