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 2022/04/20 15:37:20 UTC
[commons-vfs] branch master updated: Refactor MIME type strings into constants.
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 a29e2f2f Refactor MIME type strings into constants.
a29e2f2f is described below
commit a29e2f2fdad431100d6e378483a89044a15b7f29
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Apr 20 11:37:14 2022 -0400
Refactor MIME type strings into constants.
---
.../commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java | 2 +-
.../commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java | 2 +-
.../java/org/apache/commons/vfs2/AbstractProviderTestConfig.java | 6 ++++++
.../org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java | 2 +-
.../org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java | 2 +-
.../org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java | 2 +-
.../org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java | 2 +-
.../vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java | 2 +-
.../commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java | 2 +-
9 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
index e619fe2b..a73272c2 100644
--- a/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
+++ b/commons-vfs2-jackrabbit1/src/test/java/org/apache/commons/vfs2/provider/webdav/test/WebdavProviderTestCase.java
@@ -180,7 +180,7 @@ public class WebdavProviderTestCase extends AbstractProviderTestConfig {
if (file.isFile()) {
try (InputStream data = Files.newInputStream(file.toPath())) {
message("Importing file " + file);
- JcrUtils.putFile(parent, file.getName(), "application/octet-stream", data);
+ JcrUtils.putFile(parent, file.getName(), MIME_TYPE_APPLICATION_OCTET_STREAM, data);
}
} else if (file.isDirectory()) {
message("Importing folder " + file);
diff --git a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
index 3e0dbbe4..37962987 100644
--- a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
+++ b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/Webdav4ProviderTestCase.java
@@ -181,7 +181,7 @@ public class Webdav4ProviderTestCase extends AbstractProviderTestConfig {
if (file.isFile()) {
try (final InputStream data = Files.newInputStream(file.toPath())) {
message("Importing file " + file);
- JcrUtils.putFile(parent, file.getName(), "application/octet-stream", data);
+ JcrUtils.putFile(parent, file.getName(), MIME_TYPE_APPLICATION_OCTET_STREAM, data);
}
} else if (file.isDirectory()) {
message("Importing folder " + file);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestConfig.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestConfig.java
index 38ae0901..888f9d45 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestConfig.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestConfig.java
@@ -24,6 +24,12 @@ import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
*/
public abstract class AbstractProviderTestConfig extends AbstractProviderTestCase implements ProviderTestConfig {
+ public static final String MIME_TYPE_APPLICATION_OCTET_STREAM = "application/octet-stream";
+
+ public static final String MIME_TYPE_APPLICATION_X_TAR = "application/x-tar";
+
+ public static final String MIME_TYPE_APPLICATION_ZIP = "application/zip";
+
private FilesCache filesCache;
/**
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
index b65240e4..932ebd16 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
@@ -68,7 +68,7 @@ public class NestedTarTestCase extends AbstractProviderTestConfig {
public void prepare(final DefaultFileSystemManager manager) throws Exception {
manager.addProvider("tar", new TarFileProvider());
manager.addExtensionMap("tar", "tar");
- manager.addMimeTypeMap("application/x-tar", "tar");
+ manager.addMimeTypeMap(MIME_TYPE_APPLICATION_X_TAR, "tar");
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
index 8bbea828..de229430 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
@@ -56,7 +56,7 @@ public class TarProviderTestCase extends AbstractProviderTestConfig {
@Override
public void prepare(final DefaultFileSystemManager manager) throws Exception {
manager.addProvider("tar", new TarFileProvider());
- manager.addMimeTypeMap("application/x-tar", "tar");
+ manager.addMimeTypeMap(MIME_TYPE_APPLICATION_X_TAR, "tar");
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
index abaae1d0..27ec2fb9 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
@@ -60,7 +60,7 @@ public class NestedZipTestCase extends AbstractProviderTestConfig {
public void prepare(final DefaultFileSystemManager manager) throws Exception {
manager.addProvider("zip", new ZipFileProvider());
manager.addExtensionMap("zip", "zip");
- manager.addMimeTypeMap("application/zip", "zip");
+ manager.addMimeTypeMap(MIME_TYPE_APPLICATION_ZIP, "zip");
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
index 46681faf..63ee3875 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
@@ -57,7 +57,7 @@ public class ZipProviderTestCase extends AbstractProviderTestConfig {
public void prepare(final DefaultFileSystemManager manager) throws Exception {
manager.addProvider("zip", new ZipFileProvider());
manager.addExtensionMap("zip", "zip");
- manager.addMimeTypeMap("application/zip", "zip");
+ manager.addMimeTypeMap(MIME_TYPE_APPLICATION_ZIP, "zip");
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
index d8d0718c..f3deaec8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
@@ -70,7 +70,7 @@ public class ZipProviderWithCharsetNullTestCase extends AbstractProviderTestConf
public void prepare(final DefaultFileSystemManager manager) throws Exception {
manager.addProvider("zip", new ZipFileProvider());
manager.addExtensionMap("zip", "zip");
- manager.addMimeTypeMap("application/zip", "zip");
+ manager.addMimeTypeMap(MIME_TYPE_APPLICATION_ZIP, "zip");
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
index 25843aef..c8f21eed 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
@@ -71,7 +71,7 @@ public class ZipProviderWithCharsetTestCase extends AbstractProviderTestConfig {
public void prepare(final DefaultFileSystemManager manager) throws Exception {
manager.addProvider("zip", new ZipFileProvider());
manager.addExtensionMap("zip", "zip");
- manager.addMimeTypeMap("application/zip", "zip");
+ manager.addMimeTypeMap(MIME_TYPE_APPLICATION_ZIP, "zip");
}
}