diff --git a/changelog.md b/changelog.md
index b21da333..42a19a6b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
# Changelog
+## v1.3.2
+
+### March 28, 2024
+
+- Fix:
+ - fixed null content type issue
+
## v1.3.1
### Feb 22, 2024
diff --git a/pom.xml b/pom.xml
index 17bbc160..9ed6e771 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
cms
jar
contentstack-management-java
- 1.3.1
+ 1.3.2
Contentstack Java Management SDK for Content Management API, Contentstack is a headless CMS with an
API-first approach
@@ -177,7 +177,11 @@
1.1.1
compile
-
+
+ javax.activation
+ activation
+ 1.1.1
+
diff --git a/src/main/java/com/contentstack/cms/stack/FileUploader.java b/src/main/java/com/contentstack/cms/stack/FileUploader.java
index df0f6d16..8b28c150 100644
--- a/src/main/java/com/contentstack/cms/stack/FileUploader.java
+++ b/src/main/java/com/contentstack/cms/stack/FileUploader.java
@@ -6,9 +6,11 @@
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Objects;
+import javax.activation.MimetypesFileTypeMap;
+
public class FileUploader {
@@ -49,7 +51,9 @@ private void addFormDataPartIfNotNull(MultipartBody.Builder builder, String name
// Helper method to get content type of file
private String getContentType(File file) {
try {
- return Files.probeContentType(file.toPath());
+ java.nio.file.Path source = Paths.get(file.toString());
+ MimetypesFileTypeMap m = new MimetypesFileTypeMap(source.toString());
+ return m.getContentType(file);
} catch (IOException e) {
throw new RuntimeException("Failed to determine content type of file", e);
}
diff --git a/src/main/java/com/contentstack/cms/stack/Merge.java b/src/main/java/com/contentstack/cms/stack/Merge.java
index e95f7272..7632340c 100644
--- a/src/main/java/com/contentstack/cms/stack/Merge.java
+++ b/src/main/java/com/contentstack/cms/stack/Merge.java
@@ -41,7 +41,7 @@
* @author ***REMOVED***
* @version v1.0.0
* @see Merge
+ * "https://www.contentstack.com/docs/developers/apis/content-management-api/#merge-branches">Merge
* Branches
* @since 2023 -June-30
*/
@@ -128,7 +128,7 @@ public Call branch(@NotNull String compareBranch, JSONObject reque
*
* @return the call
* @see Get
+ * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-all-merge-jobs">Get
* all
* Merge Jobs
*/
@@ -144,7 +144,7 @@ public Call find() {
* @param mergeJobUid the key of the header to be added
* @return the call
* @see Get
+ * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-single-merge-job">Get
* a
* Single Merge Job
*/