Use classes from build.extractor.ci instead of build.api

jfrog · Jan 29, 2023 · 753c6ae · 753c6ae
1 parent 243f0f4
commit 753c6ae
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/java/src/main/java/com/jfrog/testing/IntegrationTestsHelper.java b/java/src/main/java/com/jfrog/testing/IntegrationTestsHelper.java
@@ -16,12 +16,11 @@
 import org.jfrog.artifactory.client.model.LightweightRepository;
 import org.jfrog.artifactory.client.model.RepoPath;
 import org.jfrog.artifactory.client.model.RepositoryType;
-import org.jfrog.build.api.Artifact;
-import org.jfrog.build.api.Build;
-import org.jfrog.build.api.Dependency;
-import org.jfrog.build.api.Module;
 import org.jfrog.build.api.util.NullLog;
+import org.jfrog.build.extractor.ci.Artifact;
 import org.jfrog.build.extractor.ci.BuildInfo;
+import org.jfrog.build.extractor.ci.Dependency;
+import org.jfrog.build.extractor.ci.Module;
 import org.jfrog.build.extractor.clientConfiguration.client.artifactory.ArtifactoryManager;
 
 import java.io.IOException;
@@ -248,7 +247,7 @@ public BuildInfo getBuildInfo(String buildName, String buildNumber, String proje
      *
      * @param buildInfo - Build-info object
      */
-    public void assertFilteredProperties(Build buildInfo) {
+    public void assertFilteredProperties(BuildInfo buildInfo) {
         Properties properties = buildInfo.getProperties();
         assertNotNull(properties);
         String[] unfiltered = properties.keySet().stream()
@@ -311,7 +310,7 @@ public void assertArtifactsInRepo(String repoKey, Set<String> expectedArtifacts)
      * @param moduleName - Module name
      * @return module from the build-info
      */
-    public Module getAndAssertModule(Build buildInfo, String moduleName) {
+    public Module getAndAssertModule(BuildInfo buildInfo, String moduleName) {
         assertNotNull(buildInfo);
         assertNotNull(buildInfo.getModules());
         Module module = buildInfo.getModule(moduleName);
@@ -325,7 +324,7 @@ public Module getAndAssertModule(Build buildInfo, String moduleName) {
      * @param buildInfo  - Build info object
      * @param moduleName - Module name
      */
-    public void assertModuleContainsArtifactsAndDependencies(Build buildInfo, String moduleName) {
+    public void assertModuleContainsArtifactsAndDependencies(BuildInfo buildInfo, String moduleName) {
         Module module = getAndAssertModule(buildInfo, moduleName);
         assertTrue(CollectionUtils.isNotEmpty(module.getArtifacts()));
         assertTrue(CollectionUtils.isNotEmpty(module.getDependencies()));
@@ -337,7 +336,7 @@ public void assertModuleContainsArtifactsAndDependencies(Build buildInfo, String
      * @param buildInfo  - Build info object
      * @param moduleName - Module name
      */
-    public void assertModuleContainsArtifacts(Build buildInfo, String moduleName) {
+    public void assertModuleContainsArtifacts(BuildInfo buildInfo, String moduleName) {
         Module module = getAndAssertModule(buildInfo, moduleName);
         assertTrue(CollectionUtils.isNotEmpty(module.getArtifacts()));
     }