Fixed commons-vfs sandbox module not compiling due to missing imports…

… and libraries (#634)
apache · Nov 21, 2024 · 819ee4b · 819ee4b
1 parent bbfcda1
commit 819ee4b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/commons-vfs2-sandbox/pom.xml b/commons-vfs2-sandbox/pom.xml
@@ -42,6 +42,10 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
     <dependency>
       <groupId>jcifs</groupId>
       <artifactId>jcifs</artifactId>
@@ -79,11 +83,6 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <properties>

diff --git a/...s-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java b/...s-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
@@ -33,7 +33,10 @@
 import org.apache.commons.logging.LogFactory;
 
 import jakarta.mail.Address;
+import jakarta.mail.Header;
+import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
 import jakarta.mail.internet.MimeMessage;
 
 /**
@@ -136,19 +139,19 @@ private Map<String, Object> createMap() {
         if (part instanceof MimeMessage) {
             final MimeMessage message = (MimeMessage) part;
             try {
-                final Address[] address = message.getRecipients(RecipientType.BCC);
+                final Address[] address = message.getRecipients(Message.RecipientType.BCC);
                 ret.put(OBJECT_PREFIX + "Recipients.BCC", address);
             } catch (final MessagingException e) {
                 log.debug(e.getLocalizedMessage(), e);
             }
             try {
-                final Address[] address = message.getRecipients(RecipientType.CC);
+                final Address[] address = message.getRecipients(Message.RecipientType.CC);
                 ret.put(OBJECT_PREFIX + "Recipients.CC", address);
             } catch (final MessagingException e) {
                 log.debug(e.getLocalizedMessage(), e);
             }
             try {
-                final Address[] address = message.getRecipients(RecipientType.TO);
+                final Address[] address = message.getRecipients(Message.RecipientType.TO);
                 ret.put(OBJECT_PREFIX + "Recipients.TO", address);
             } catch (final MessagingException e) {
                 log.debug(e.getLocalizedMessage(), e);

diff --git a/...ndbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java b/...ndbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java
@@ -23,6 +23,8 @@
 import org.apache.commons.vfs2.impl.DefaultFileContentInfo;
 
 import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
+import jakarta.mail.internet.ContentType;
 
 /**
  * Gets access to the content info stuff for mime objects.
@@ -31,7 +33,7 @@ public class MimeFileContentInfoFactory implements FileContentInfoFactory {
     @Override
     public FileContentInfo create(final FileContent fileContent) throws FileSystemException {
         final MimeFileObject mimeFile = (MimeFileObject) fileContent.getFile();
-        final Part part = mimeFile.getPart();
+        final Part part = (Part) mimeFile.getPart();
 
         String contentTypeString = null;
         String charset = null;

diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.vfs2.provider.mime;
 
+import jakarta.mail.Header;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -37,6 +38,7 @@
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import jakarta.mail.Multipart;
+import jakarta.mail.Part;
 import jakarta.mail.internet.MimeMultipart;
 
 /**
@@ -64,7 +66,7 @@ protected void doAttach() throws Exception {
                 return;
             }
 
-            setPart(((MimeFileSystem) getFileSystem()).createCommunicationLink());
+            setPart((Part) ((MimeFileSystem) getFileSystem()).createCommunicationLink());
         }
     }
 

diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java
@@ -33,6 +33,7 @@
 import org.apache.commons.vfs2.util.SharedRandomContentInputStream;
 
 import jakarta.mail.MessagingException;
+import jakarta.mail.Part;
 import jakarta.mail.internet.MimeMessage;
 
 /**

diff --git a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java
@@ -20,7 +20,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.FileSystemException;