Remove deprecated methods

eclipse · Apr 3, 2024 · 8685f8c · 8685f8c
1 parent 1c2bfee
commit 8685f8c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 39 deletions.
diff --git a/deb/src/main/java/org/eclipse/packager/deb/Packages.java b/deb/src/main/java/org/eclipse/packager/deb/Packages.java
@@ -12,7 +12,6 @@
  */
 package org.eclipse.packager.deb;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -37,11 +36,6 @@ public final class Packages {
     private Packages() {
     }
 
-    @Deprecated
-    public static Map<String, String> parseControlFile(final File packageFile) throws IOException, ParserException {
-        return parseControlFile(packageFile.toPath());
-    }
-
     public static Map<String, String> parseControlFile(final Path packageFile) throws IOException, ParserException {
         try (final ArArchiveInputStream in = new ArArchiveInputStream(Files.newInputStream(packageFile))) {
             ArchiveEntry ar;

diff --git a/deb/src/main/java/org/eclipse/packager/deb/build/DebianPackageWriter.java b/deb/src/main/java/org/eclipse/packager/deb/build/DebianPackageWriter.java
@@ -12,7 +12,6 @@
  */
 package org.eclipse.packager.deb.build;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -101,11 +100,6 @@ public DebianPackageWriter(final OutputStream stream, final BinaryPackageControl
         this.dataStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
     }
 
-    @Deprecated
-    public void addFile(final File file, final String fileName, final EntryInformation entryInformation) throws IOException {
-        addFile(file.toPath(), fileName, entryInformation);
-    }
-
     public void addFile(final Path file, final String fileName, final EntryInformation entryInformation) throws IOException {
         addFile(new FileContentProvider(file), fileName, entryInformation, Optional.of(() -> {
             if (file == null || !Files.isReadable(file)) {
@@ -120,11 +114,6 @@ public void addFile(final Path file, final String fileName, final EntryInformati
         }));
     }
 
-    @Deprecated
-    public void addFile(final File file, final String fileName, final EntryInformation entryInformation, final Optional<Supplier<Instant>> timestampSupplier) throws IOException {
-        addFile(file.toPath(), fileName, entryInformation, timestampSupplier);
-    }
-
     public void addFile(final Path file, final String fileName, final EntryInformation entryInformation, final Optional<Supplier<Instant>> timestampSupplier) throws IOException {
         addFile(new FileContentProvider(file), fileName, entryInformation, timestampSupplier);
     }

diff --git a/deb/src/main/java/org/eclipse/packager/deb/build/FileContentProvider.java b/deb/src/main/java/org/eclipse/packager/deb/build/FileContentProvider.java
@@ -12,21 +12,14 @@
  */
 package org.eclipse.packager.deb.build;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 public class FileContentProvider implements ContentProvider {
-
     private final Path file;
 
-    @Deprecated
-    public FileContentProvider(final File file) {
-        this(file.toPath());
-    }
-
     public FileContentProvider(final Path file) {
         this.file = file;
     }

diff --git a/deb/src/main/java/org/eclipse/packager/deb/build/TextFileContentProvider.java b/deb/src/main/java/org/eclipse/packager/deb/build/TextFileContentProvider.java
@@ -13,7 +13,6 @@
 package org.eclipse.packager.deb.build;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -23,11 +22,6 @@
 public class TextFileContentProvider implements ContentProvider {
     private final byte[] data;
 
-    @Deprecated
-    public TextFileContentProvider(final File file) throws IOException {
-        this(file.toPath());
-    }
-
     public TextFileContentProvider(final Path file) throws IOException {
         if (file != null) {
             String data = Files.readString(file);
@@ -54,7 +48,7 @@ public long getSize() {
     }
 
     @Override
-    public InputStream createInputStream() throws IOException {
+    public InputStream createInputStream() {
         if (this.data != null) {
             return new ByteArrayInputStream(this.data);
         } else {

diff --git a/rpm/src/main/java/org/eclipse/packager/rpm/signature/RpmFileSignatureProcessor.java b/rpm/src/main/java/org/eclipse/packager/rpm/signature/RpmFileSignatureProcessor.java
@@ -13,7 +13,6 @@
 package org.eclipse.packager.rpm.signature;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -47,17 +46,10 @@
  * {@link #perform(Path, InputStream, String, OutputStream, HashAlgorithm)}
  */
 public class RpmFileSignatureProcessor {
-
     private RpmFileSignatureProcessor() {
         // Hide default constructor because of the static context
     }
 
-    @Deprecated
-    public static void perform(File rpm, InputStream privateKeyIn, String passphrase, OutputStream out, HashAlgorithm hashAlgorithm)
-        throws IOException, PGPException {
-        perform(rpm.toPath(), privateKeyIn, passphrase, out, hashAlgorithm);
-    }
-
     /**
      * <p>
      * Perform the signature of the given RPM file with the given private key. This