From 5fda07c5554c355f67b197e68c63d11f5ee2e6da Mon Sep 17 00:00:00 2001
From: Andrew Harrison <doctor.zob@gmail.com>
Date: Mon, 21 Aug 2023 19:01:04 +0100
Subject: [PATCH] Fix upload file naming

---
 CHANGELOG.md                                        | 7 +++++++
 pom.xml                                             | 2 +-
 src/main/java/com/simbachain/simba/SimbaClient.java | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f3d36c..1b10dd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.0.5](https://github.com/SIMBAChain/libsimba4j-platform/compare/v1.0.4...v1.0.5) (2023-08-21)
+
+### Fixes
+
+* Fix file upload file names not being captured.
+
+
 ## [1.0.4](https://github.com/SIMBAChain/libsimba4j-platform/compare/v1.0.3...v1.0.4) (2023-06-24)
 
 ### Fixes
diff --git a/pom.xml b/pom.xml
index c568bbd..3da9377 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.simbachain</groupId>
 	<artifactId>libsimba4j-platform</artifactId>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.0.6-SNAPSHOT</version>
     <name>LibSimba4J Blocks Platform</name>
     <description>Java Client for SIMBA Chain Blocks Platform</description>
     <url>https://simbachain.github.io/libsimba4j/</url>
diff --git a/src/main/java/com/simbachain/simba/SimbaClient.java b/src/main/java/com/simbachain/simba/SimbaClient.java
index 6d64e80..7eb7c0e 100644
--- a/src/main/java/com/simbachain/simba/SimbaClient.java
+++ b/src/main/java/com/simbachain/simba/SimbaClient.java
@@ -467,9 +467,16 @@ protected HttpEntity createEntity(Map<String, Object> data, UploadFile... files)
                 builder.addTextBody(key, d.toString());
 
             }
+            Map<String, String> names = new HashMap<>();
             for (int i = 0; i < files.length; i++) {
                 UploadFile file = files[i];
-                builder.addBinaryBody(String.format("file_%s", i), file.getFile(),
+                String name = file.getName(); 
+                if(names.get(name) != null) {
+                    name = String.format("%s_%s", i, name);
+                } else {
+                    names.put(name, name);
+                }
+                builder.addBinaryBody(name, file.getFile(),
                     ContentType.create(file.getMimeType()), file.getName());
             }
             return builder.build();