You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/11/21 16:29:25 UTC
(commons-vfs) branch master updated: Fixed commons-vfs sandbox module not compiling due to missing imports and libraries (#634)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 819ee4b5 Fixed commons-vfs sandbox module not compiling due to missing imports and libraries (#634)
819ee4b5 is described below
commit 819ee4b55002a82ac25695dcd5e1f4d366d9d97c
Author: Anthony Goubard <an...@japplis.com>
AuthorDate: Thu Nov 21 17:29:20 2024 +0100
Fixed commons-vfs sandbox module not compiling due to missing imports and libraries (#634)
---
commons-vfs2-sandbox/pom.xml | 9 ++++-----
.../org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java | 9 ++++++---
.../commons/vfs2/provider/mime/MimeFileContentInfoFactory.java | 4 +++-
.../org/apache/commons/vfs2/provider/mime/MimeFileObject.java | 4 +++-
.../org/apache/commons/vfs2/provider/mime/MimeFileSystem.java | 1 +
.../java/org/apache/commons/vfs2/util/FileObjectDataSource.java | 2 +-
6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/commons-vfs2-sandbox/pom.xml b/commons-vfs2-sandbox/pom.xml
index 818080da..b3680cf8 100644
--- 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/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
index 5914163e..33a58a1b 100644
--- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
+++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeAttributesMap.java
@@ -33,7 +33,10 @@ import org.apache.commons.logging.Log;
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 @@ public class MimeAttributesMap implements Map<String, Object> {
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/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java
index 2c8606e6..05cb3e4b 100644
--- a/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java
+++ b/commons-vfs2-sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java
@@ -23,6 +23,8 @@ import org.apache.commons.vfs2.FileSystemException;
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
index c7fde2de..083e5ca1 100644
--- 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 org.apache.commons.vfs2.util.FileObjectUtils;
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 @@ public class MimeFileObject extends AbstractFileObject<MimeFileSystem> implement
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
index a7723a41..408146ad 100644
--- 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.provider.AbstractFileSystem;
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
index f8b90fa4..200417d9 100644
--- 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.IOException;
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;