Remove a few other references

apache · May 2, 2024 · 4a6ab18 · 4a6ab18
1 parent a014700
commit 4a6ab18
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 30 deletions.
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
@@ -116,17 +116,6 @@ public Artifact setVersion(String version) {
         return new RelocatedArtifact(artifact, groupId, artifactId, classifier, extension, version, message);
     }
 
-    @Deprecated
-    @Override
-    public Artifact setFile(File file) {
-        File current = getFile();
-        if (Objects.equals(current, file)) {
-            return this;
-        }
-        return new RelocatedArtifact(
-                artifact.setFile(file), groupId, artifactId, classifier, extension, version, message);
-    }
-
     @Override
     public Artifact setPath(Path path) {
         Path current = getPath();

diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -409,7 +409,7 @@ private void installIntoProjectLocalRepository(Artifact artifact) {
             LOGGER.info("Copying {} to project local repository", artifact);
             Files.createDirectories(target.getParent());
             Files.copy(
-                    artifact.getFile().toPath(),
+                    artifact.getPath(),
                     target,
                     StandardCopyOption.REPLACE_EXISTING,
                     StandardCopyOption.COPY_ATTRIBUTES);

diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -67,10 +67,7 @@ public Optional<Path> getPath(@Nonnull Artifact artifact) {
         }
         Path path = paths.get(id);
         if (path == null && artifact instanceof DefaultArtifact) {
-            File file = ((DefaultArtifact) artifact).getArtifact().getFile();
-            if (file != null) {
-                path = file.toPath();
-            }
+            path = ((DefaultArtifact) artifact).getArtifact().getPath();
         }
         return Optional.ofNullable(path);
     }

diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
@@ -75,7 +75,7 @@ public void get(
             for (ArtifactDownload download : artifactDownloads) {
                 File remoteFile = new File(basedir, path(download.getArtifact()));
                 try {
-                    Path dest = download.getFile().toPath();
+                    Path dest = download.getPath();
                     Files.createDirectories(dest.getParent());
                     Files.copy(remoteFile.toPath(), dest);
                 } catch (IOException e) {
@@ -91,7 +91,7 @@ public void get(
             for (final MetadataDownload download : metadataDownloads) {
                 File remoteFile = new File(basedir, path(download.getMetadata()));
                 try {
-                    Path dest = download.getFile().toPath();
+                    Path dest = download.getPath();
                     Files.createDirectories(dest.getParent());
                     Files.copy(remoteFile.toPath(), dest);
                 } catch (IOException e) {

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1190,7 +1190,7 @@ private org.apache.maven.api.model.Model doReadFileModel(
         }
 
         if (modelSource instanceof FileModelSource) {
-            model = model.withPomFile(((FileModelSource) modelSource).getFile().toPath());
+            model = model.withPomFile(((FileModelSource) modelSource).getPath());
         }
 
         Model retModel = new Model(model);

diff --git a/...solver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/...solver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -116,17 +116,6 @@ public Artifact setVersion(String version) {
         return new RelocatedArtifact(artifact, groupId, artifactId, classifier, extension, version, message);
     }
 
-    @Deprecated
-    @Override
-    public Artifact setFile(File file) {
-        File current = getFile();
-        if (Objects.equals(current, file)) {
-            return this;
-        }
-        return new RelocatedArtifact(
-                artifact.setFile(file), groupId, artifactId, classifier, extension, version, message);
-    }
-
     @Override
     public Artifact setPath(Path path) {
         Path current = getPath();