Rename ProvidedArtifact -> ArtifactInfo

3 files changed, 12 insertions, 12 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index b9025d8fb65..38e8acc1303 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -8,8 +8,8 @@ import com.yahoo.container.plugin.classanalysis.PackageTally;
 import com.yahoo.container.plugin.osgi.ExportPackages;
 import com.yahoo.container.plugin.osgi.ExportPackages.Export;
 import com.yahoo.container.plugin.osgi.ImportPackages.Import;
+import com.yahoo.container.plugin.util.ArtifactInfo;
 import com.yahoo.container.plugin.util.Artifacts;
-import com.yahoo.container.plugin.util.ProvidedArtifact;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -244,15 +244,15 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
         }
     }
 
-    private void logProvidedArtifactsIncluded(List<Artifact> includedArtifacts, List<ProvidedArtifact> providedArtifacts) {
+    private void logProvidedArtifactsIncluded(List<Artifact> includedArtifacts, List<ArtifactInfo> providedArtifacts) {
         if (suppressWarningEmbeddedArtifacts || effectiveBundleType() == BundleType.CORE) return;
 
-        Set<ProvidedArtifact> included = includedArtifacts.stream().map(ProvidedArtifact::new).collect(Collectors.toSet());
-        Set<ProvidedArtifact> providedIncluded = Sets.intersection(included, new HashSet<>(providedArtifacts));
+        Set<ArtifactInfo> included = includedArtifacts.stream().map(ArtifactInfo::new).collect(Collectors.toSet());
+        Set<ArtifactInfo> providedIncluded = Sets.intersection(included, new HashSet<>(providedArtifacts));
         if (providedIncluded.isEmpty()) return;
 
         List<String> sorted = providedIncluded.stream()
-                .map(ProvidedArtifact::stringValue)
+                .map(ArtifactInfo::stringValue)
                 .sorted().toList();
 
         // TODO: improve error message
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/ProvidedArtifact.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/ArtifactInfo.java
index dbc006a4cb5..32cc732241b 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/ProvidedArtifact.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/ArtifactInfo.java
@@ -3,23 +3,23 @@ package com.yahoo.container.plugin.util;
 import org.apache.maven.artifact.Artifact;
 
 /**
- * Helper class to work with artifacts provided by the container.
+ * Helper class to work with artifacts.
  *
  * @author gjoranv
  */
-public record ProvidedArtifact(String groupId, String artifactId, String version) {
+public record ArtifactInfo(String groupId, String artifactId, String version) {
 
 
-    public ProvidedArtifact(Artifact artifact) {
+    public ArtifactInfo(Artifact artifact) {
         this(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
     }
 
-    public static ProvidedArtifact fromStringValue(String stringValue) {
+    public static ArtifactInfo fromStringValue(String stringValue) {
         var parts = stringValue.split(":");
         if (parts.length != 3) {
             throw new IllegalArgumentException("Invalid artifact string: " + stringValue);
         }
-        return new ProvidedArtifact(parts[0], parts[1], parts[2]);
+        return new ArtifactInfo(parts[0], parts[1], parts[2]);
     }
 
     public String stringValue() {
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java
index ade8a4984e8..f5f0de70ea7 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java
@@ -18,10 +18,10 @@ import java.util.zip.ZipFile;
  */
 public class JarFiles {
 
-    public static List<ProvidedArtifact> providedArtifactsFromClassPath(File jarFile) {
+    public static List<ArtifactInfo> providedArtifactsFromClassPath(File jarFile) {
         return getManifest(jarFile).map(mf -> getMainAttributeValue(mf, "Class-Path")
                         .map(s -> Arrays.stream(s.split(" "))
-                                .map(ProvidedArtifact::fromStringValue)
+                                .map(ArtifactInfo::fromStringValue)
                                 .toList())
                         .orElse(Collections.emptyList()))
                 .orElse(Collections.emptyList());