Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8347286: (fs) Remove some extensions from java/nio/file/Files/probeContentType/Basic.java #1504

Closed
wants to merge 1 commit into from
+2 −13
Closed

8347286: (fs) Remove some extensions from java/nio/file/Files/probeContentType/Basic.java #1504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions test/jdk/java/nio/file/Files/probeContentType/Basic.java
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,6 @@
import java.util.stream.Stream;

import jdk.internal.util.OperatingSystem;
import jdk.internal.util.OSVersion;
import jdk.internal.util.StaticProperty;

/**
@@ -189,18 +188,8 @@ public static void main(String[] args) throws IOException {
exTypes.add(new ExType("xlsx", List.of("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")));
exTypes.add(new ExType("wasm", List.of("application/wasm")));

// extensions with content type that differs on Windows 11+ and
// Windows Server 2025
if (OperatingSystem.isWindows() &&
(StaticProperty.osName().matches("^.*[11|2025]$") ||
new OSVersion(10, 0).compareTo(OSVersion.current()) > 0)) {
System.out.println("Windows 11+ detected: using different types");
exTypes.add(new ExType("bz2", List.of("application/bz2", "application/x-bzip2", "application/x-bzip", "application/x-compressed")));
exTypes.add(new ExType("csv", List.of("text/csv", "application/vnd.ms-excel")));
exTypes.add(new ExType("rar", List.of("application/rar", "application/vnd.rar", "application/x-rar", "application/x-rar-compressed", "application/x-compressed")));
exTypes.add(new ExType("rtf", List.of("application/rtf", "text/rtf", "application/msword")));
exTypes.add(new ExType("7z", List.of("application/x-7z-compressed", "application/x-compressed")));
} else {
// extensions with consistent content type on Unix (but not on Windows)
if (!OperatingSystem.isWindows()) {
exTypes.add(new ExType("bz2", List.of("application/bz2", "application/x-bzip2", "application/x-bzip")));
exTypes.add(new ExType("csv", List.of("text/csv")));
exTypes.add(new ExType("rar", List.of("application/rar", "application/vnd.rar", "application/x-rar", "application/x-rar-compressed")));